2005-05-24 12:20:23

by Gerd Hoffmann

[permalink] [raw]
Subject: [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 <[email protected]>
---
drivers/media/video/bttv-i2c.c | 3 +++
1 files changed, 3 insertions(+)

Index: linux-2.6.12-rc3/drivers/media/video/bttv-i2c.c
===================================================================
--- linux-2.6.12-rc3.orig/drivers/media/video/bttv-i2c.c 2005-04-26 12:18:56.000000000 +0200
+++ linux-2.6.12-rc3/drivers/media/video/bttv-i2c.c 2005-05-24 14:17:01.000000000 +0200
@@ -365,6 +365,9 @@ int bttv_I2CWrite(struct bttv *btv, unsi
/* read EEPROM content */
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;
tveeprom_read(&btv->i2c_client, eedata, 256);
}

--
-mm seems unusually stable at present.
-- akpm about 2.6.12-rc3-mm3