OSDN Git Service

[media] bttv: fix sparse warning
authorHans Verkuil <hans.verkuil@cisco.com>
Wed, 5 Nov 2014 07:50:10 +0000 (04:50 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Wed, 5 Nov 2014 11:07:19 +0000 (09:07 -0200)
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 <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/pci/bt8xx/bttv-cards.c

index d8ec583..4105560 100644 (file)
@@ -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)