Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[pandora-kernel.git] / drivers / media / video / pvrusb2 / pvrusb2-eeprom.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
index 6cff8e7..5ef0059 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
@@ -102,9 +102,8 @@ static u8 *pvr2_eeprom_fetch(struct pvr2_hdw *hdw)
                }
                msg[1].len = pcnt;
                msg[1].buf = eeprom+tcnt;
-               if ((ret = i2c_transfer(
-                            &hdw->i2c_adap,
-                            msg,sizeof(msg)/sizeof(msg[0]))) != 2) {
+               if ((ret = i2c_transfer(&hdw->i2c_adap,
+                                       msg,ARRAY_SIZE(msg))) != 2) {
                        pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                                   "eeprom fetch set offs err=%d",ret);
                        kfree(eeprom);
@@ -145,6 +144,7 @@ int pvr2_eeprom_analyze(struct pvr2_hdw *hdw)
        trace_eeprom("serial_number=%d",tvdata.serial_number);
        trace_eeprom("rev_str=%s",tvdata.rev_str);
        hdw->tuner_type = tvdata.tuner_type;
+       hdw->tuner_updated = !0;
        hdw->serial_number = tvdata.serial_number;
        hdw->std_mask_eeprom = tvdata.tuner_formats;