From: Hans Verkuil <hans.verk...@cisco.com>

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.verk...@cisco.com>
---
 drivers/media/pci/bt8xx/bttv-cards.c | 6 +++---
 1 file 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)
-- 
2.1.1

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to