summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-11-05 07:50:10 (GMT)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-05 11:07:19 (GMT)
commitcf38d4b92dee1635967b8e85ae607e6fcf6be19e (patch)
tree1d807915a4a0b5da226f2dd56e689181ea02487c
parent4895cc47a072dcb32d3300d0a46a251a8c6db5f1 (diff)
downloadlinux-cf38d4b92dee1635967b8e85ae607e6fcf6be19e.tar.xz
[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 <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/pci/bt8xx/bttv-cards.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-cards.c b/drivers/media/pci/bt8xx/bttv-cards.c
index d8ec583..4105560 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)