lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (9627): em28xx: Avoid i2c register error for boards without eeprom

Browse Source 
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab
2008-11-15 23:44:14 -03:00
parent df4533af7f
commit c41109fc9a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/video/em28xx/em28xx-i2c.c
View File

@@ -337,9 +337,9 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
/* Check if board has eeprom */ /* Check if board has eeprom */
err = i2c_master_recv(&dev->i2c_client, &buf, 0); err = i2c_master_recv(&dev->i2c_client, &buf, 0);
if (err < 0) { if (err < 0) {
em28xx_errdev("%s: i2c_master_recv failed! err [%d]\n", em28xx_errdev("board has no eeprom\n");
__func__, err); memset(eedata, 0, len);
return err; return -ENODEV;
} }
buf = 0; buf = 0;
@@ -609,14 +609,16 @@ int em28xx_i2c_register(struct em28xx *dev)
dev->i2c_client.adapter = &dev->i2c_adap; dev->i2c_client.adapter = &dev->i2c_adap;
retval = em28xx_i2c_eeprom(dev, dev->eedata, sizeof(dev->eedata)); retval = em28xx_i2c_eeprom(dev, dev->eedata, sizeof(dev->eedata));
if (retval < 0) { if ((retval < 0) && (retval != -ENODEV)) {
em28xx_errdev("%s: em28xx_i2_eeprom failed! retval [%d]\n", em28xx_errdev("%s: em28xx_i2_eeprom failed! retval [%d]\n",
__func__, retval); __func__, retval);
return retval; return retval;
} }
if (i2c_scan) if (i2c_scan)
em28xx_do_i2c_scan(dev); em28xx_do_i2c_scan(dev);
return 0; return 0;
} }