diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-02 10:04:03 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-02 10:04:03 -0300 |
| commit | bc6904a7147ba36928a3a859508155090c432f92 (patch) | |
| tree | 3b199bff33dcb1d6413db5c998f0f262a7376a3f /linux/drivers/media/video/sn9c102/sn9c102_hv7131r.c | |
| parent | 4150c636f12b5dffa698344e849da59765b827f7 (diff) | |
| download | mediapointer-dvb-s2-bc6904a7147ba36928a3a859508155090c432f92.tar.gz mediapointer-dvb-s2-bc6904a7147ba36928a3a859508155090c432f92.tar.bz2 | |
SN9C1xx driver updates
From: Luca Risolia <luca.risolia@studio.unibo.it>
Changes: + new, * cleanup, @ bugfix
* Default color improvements to the OV7660
@ Fix sn9c102_write_reg()
@ Fix sn9c102_i2c_try_raw_read()
@ Fix MI-0343
+ Add support for pair MI0360+SN9C120
+ Add more USB ids
Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/sn9c102/sn9c102_hv7131r.c')
| -rw-r--r-- | linux/drivers/media/video/sn9c102/sn9c102_hv7131r.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/linux/drivers/media/video/sn9c102/sn9c102_hv7131r.c b/linux/drivers/media/video/sn9c102/sn9c102_hv7131r.c index 5a495baa5..0fc401223 100644 --- a/linux/drivers/media/video/sn9c102/sn9c102_hv7131r.c +++ b/linux/drivers/media/video/sn9c102/sn9c102_hv7131r.c @@ -44,7 +44,6 @@ static int hv7131r_init(struct sn9c102_device* cam) {0xb0, 0x2b}, {0xc0, 0x2c}, {0xd0, 0x2d}, {0xe0, 0x2e}, {0xf0, 0x2f}, {0xff, 0x30}); - break; case BRIDGE_SN9C105: case BRIDGE_SN9C120: @@ -254,7 +253,7 @@ static int hv7131r_set_pix_format(struct sn9c102_device* cam, } -static struct sn9c102_sensor hv7131r = { +static const struct sn9c102_sensor hv7131r = { .name = "HV7131R", .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>", .supported_bridge = BRIDGE_SN9C103 | BRIDGE_SN9C105 | BRIDGE_SN9C120, @@ -350,11 +349,8 @@ int sn9c102_probe_hv7131r(struct sn9c102_device* cam) {0x34, 0x01}, {0x20, 0x17}, {0x34, 0x01}, {0x46, 0x01}); - if (err) - return -EIO; - devid = sn9c102_i2c_try_read(cam, &hv7131r, 0x00); - if (devid < 0) + if (err || devid < 0) return -EIO; if (devid != 0x02) |