diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-03-10 18:21:07 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-27 07:45:55 -0400 |
commit | 3284b4e077cb2322754ea7455b8f8af7ce3777b8 (patch) | |
tree | 4cac8bace31daa49c899f39129f64b896c9c9a48 /drivers/media/video | |
parent | a9aaec4e83e687d23b78b38e331bbd6a10b96380 (diff) |
V4L/DVB (5415): Msp_attach must return 0 if no msp3400 was found.
Returning -1 causes the probe to stop, but it should just continue
instead.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/msp3400-driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c index 2fb9fe6a1ae7..91078c0d8fea 100644 --- a/drivers/media/video/msp3400-driver.c +++ b/drivers/media/video/msp3400-driver.c | |||
@@ -825,7 +825,7 @@ static int msp_attach(struct i2c_adapter *adapter, int address, int kind) | |||
825 | if (msp_reset(client) == -1) { | 825 | if (msp_reset(client) == -1) { |
826 | v4l_dbg(1, msp_debug, client, "msp3400 not found\n"); | 826 | v4l_dbg(1, msp_debug, client, "msp3400 not found\n"); |
827 | kfree(client); | 827 | kfree(client); |
828 | return -1; | 828 | return 0; |
829 | } | 829 | } |
830 | 830 | ||
831 | state = kmalloc(sizeof(*state), GFP_KERNEL); | 831 | state = kmalloc(sizeof(*state), GFP_KERNEL); |
@@ -859,7 +859,7 @@ static int msp_attach(struct i2c_adapter *adapter, int address, int kind) | |||
859 | v4l_dbg(1, msp_debug, client, "not an msp3400 (cannot read chip version)\n"); | 859 | v4l_dbg(1, msp_debug, client, "not an msp3400 (cannot read chip version)\n"); |
860 | kfree(state); | 860 | kfree(state); |
861 | kfree(client); | 861 | kfree(client); |
862 | return -1; | 862 | return 0; |
863 | } | 863 | } |
864 | 864 | ||
865 | msp_set_audio(client); | 865 | msp_set_audio(client); |