From: Hans Verkuil Date: Wed, 5 Nov 2014 07:50:10 +0000 (-0300) Subject: [media] bttv: fix sparse warning X-Git-Tag: firefly_0821_release~176^2~2474^2~231 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cf38d4b92dee1635967b8e85ae607e6fcf6be19e;p=firefly-linux-kernel-4.4.55.git [media] bttv: fix sparse warning bttv-cards.c:3874:55: warning: incorrect type in initializer (different base types) Also clean up the code a little by adding spaces. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/pci/bt8xx/bttv-cards.c b/drivers/media/pci/bt8xx/bttv-cards.c index d8ec583c154c..41055606b969 100644 --- a/drivers/media/pci/bt8xx/bttv-cards.c +++ b/drivers/media/pci/bt8xx/bttv-cards.c @@ -3870,10 +3870,10 @@ static void osprey_eeprom(struct bttv *btv, const u8 ee[256]) } else { unsigned short type; - for (i = 4*16; i < 8*16; i += 16) { - u16 checksum = ip_compute_csum(ee + i, 16); + for (i = 4 * 16; i < 8 * 16; i += 16) { + u16 checksum = (__force u16)ip_compute_csum(ee + i, 16); - if ((checksum&0xff) + (checksum>>8) == 0xff) + if ((checksum & 0xff) + (checksum >> 8) == 0xff) break; } if (i >= 8*16)