Эх сурвалжийг харах

[PATCH] v4l: bttv i2c oops fix

Don't try to access the i2c bus if the register wasn't successful.

Signed-off-by: Gerd Knorr <kraxel@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Gerd Knorr 20 жил өмнө
parent
commit
5daf05fbf7

+ 3 - 0
drivers/media/video/bttv-i2c.c

@@ -363,6 +363,9 @@ int bttv_I2CWrite(struct bttv *btv, unsigned char addr, unsigned char b1,
 /* read EEPROM content */
 /* read EEPROM content */
 void __devinit bttv_readee(struct bttv *btv, unsigned char *eedata, int addr)
 void __devinit bttv_readee(struct bttv *btv, unsigned char *eedata, int addr)
 {
 {
+	memset(eedata, 0, 256);
+	if (0 != btv->i2c_rc)
+		return;
 	btv->i2c_client.addr = addr >> 1;
 	btv->i2c_client.addr = addr >> 1;
 	tveeprom_read(&btv->i2c_client, eedata, 256);
 	tveeprom_read(&btv->i2c_client, eedata, 256);
 }
 }