summaryrefslogtreecommitdiff
path: root/drivers/media/video/bttv-i2c.c
diff options
context:
space:
mode:
author <jgarzik@pretzel.yyz.us>2005-05-27 22:08:07 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-05-27 22:08:07 -0400
commit51a730d758ae4052e10ca7e06336f10af598c4fc (patch)
treeb76a004c00cd7139659be515ee03398e47067290 /drivers/media/video/bttv-i2c.c
parent6cd15a9daf826115356f9403494c76e5aafa7793 (diff)
parentff0e0ea2f5d36fa90fc2c57fd019102b0a0cfabf (diff)
Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211
Diffstat (limited to 'drivers/media/video/bttv-i2c.c')
-rw-r--r--drivers/media/video/bttv-i2c.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index e3f477dff827..c2368bc832ed 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/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 */
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);
}