diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-09-16 15:47:15 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2007-09-16 15:47:15 +0200 |
| commit | 3f466835bc047f9f83f11ce8dcecc3021de4dec2 (patch) | |
| tree | a688c9069871f15ef1438a288515712f9e1a73ed /linux/drivers/media/video/cx25840 | |
| parent | 80d4ab9102f845bde660eab7e43d80af2c2fc328 (diff) | |
| download | mediapointer-dvb-s2-3f466835bc047f9f83f11ce8dcecc3021de4dec2.tar.gz mediapointer-dvb-s2-3f466835bc047f9f83f11ce8dcecc3021de4dec2.tar.bz2 | |
Use correct error codes when chip is not recognized.
From: Hans Verkuil <hverkuil@xs4all.nl>
If the chip isn't recognized, then the correct errors should be returned.
The v4l2_i2c_attach() utility function will return 0 for all errors
except -ENOMEM to provide proper compatibility support for the old I2C
probing function.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
linux/drivers/media/video/cs53l32a.c | 2 +-
linux/drivers/media/video/cx25840/cx25840-core.c | 6 +++++-
linux/drivers/media/video/msp3400-driver.c | 4 ++--
linux/drivers/media/video/saa7115.c | 4 ++--
linux/drivers/media/video/saa7127.c | 6 +++---
linux/drivers/media/video/tlv320aic23b.c | 2 +-
linux/drivers/media/video/upd64031a.c | 2 +-
linux/drivers/media/video/upd64083.c | 2 +-
linux/drivers/media/video/v4l2-common.c | 2 +-
linux/drivers/media/video/vp27smpx.c | 2 +-
linux/drivers/media/video/wm8739.c | 4 ++++
11 files changed, 22 insertions(+), 14 deletions(-)
Diffstat (limited to 'linux/drivers/media/video/cx25840')
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c index 89fec724c..3f249b025 100644 --- a/linux/drivers/media/video/cx25840/cx25840-core.c +++ b/linux/drivers/media/video/cx25840/cx25840-core.c @@ -1099,6 +1099,10 @@ static int cx25840_probe(struct i2c_client *client) u32 id; u16 device_id; + /* Check if the adapter supports the needed features */ + if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) + return -EIO; + v4l_dbg(1, cx25840_debug, client, "detecting cx25840 client on address 0x%x\n", client->addr << 1); device_id = cx25840_read(client, 0x101) << 8; @@ -1114,7 +1118,7 @@ static int cx25840_probe(struct i2c_client *client) } else { v4l_dbg(1, cx25840_debug, client, "cx25840 not found\n"); - return 0; + return -ENODEV; } state = kzalloc(sizeof(struct cx25840_state), GFP_KERNEL); |