diff options
author | Jean-François Moine <moinejf@free.fr> | 2010-10-29 07:10:37 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:16:32 -0500 |
commit | a79cc7b9182abb2e3936a26064dec414b417f1d1 (patch) | |
tree | 724bffff13a9d9326ca5a2ab13060653385c9ef1 | |
parent | d581bcd78be567af7026e3d13b54ec7df8db8b82 (diff) |
[media] gspca - sonixj: Simplify and clarify the hv7131r probe function
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/gspca/sonixj.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c index e23de57e2c73..901ca81e81e1 100644 --- a/drivers/media/video/gspca/sonixj.c +++ b/drivers/media/video/gspca/sonixj.c | |||
@@ -1598,22 +1598,22 @@ static void i2c_w_seq(struct gspca_dev *gspca_dev, | |||
1598 | } | 1598 | } |
1599 | } | 1599 | } |
1600 | 1600 | ||
1601 | /* check the ID of the hv7131 sensor */ | ||
1602 | /* this sequence is needed because it activates the sensor */ | ||
1601 | static void hv7131r_probe(struct gspca_dev *gspca_dev) | 1603 | static void hv7131r_probe(struct gspca_dev *gspca_dev) |
1602 | { | 1604 | { |
1603 | i2c_w1(gspca_dev, 0x02, 0); /* sensor wakeup */ | 1605 | i2c_w1(gspca_dev, 0x02, 0); /* sensor wakeup */ |
1604 | msleep(10); | 1606 | msleep(10); |
1605 | reg_w1(gspca_dev, 0x02, 0x66); /* Gpio on */ | 1607 | reg_w1(gspca_dev, 0x02, 0x66); /* Gpio on */ |
1606 | msleep(10); | 1608 | msleep(10); |
1607 | i2c_r(gspca_dev, 0, 5); /* read sensor id */ | 1609 | i2c_r(gspca_dev, 0, 5); /* read sensor id */ |
1608 | if (gspca_dev->usb_buf[0] == 0x02 | 1610 | if (gspca_dev->usb_buf[0] == 0x02 /* chip ID (02 is R) */ |
1609 | && gspca_dev->usb_buf[1] == 0x09 | 1611 | && gspca_dev->usb_buf[1] == 0x09 |
1610 | && gspca_dev->usb_buf[2] == 0x01 | 1612 | && gspca_dev->usb_buf[2] == 0x01) { |
1611 | && gspca_dev->usb_buf[3] == 0x00 | 1613 | PDEBUG(D_PROBE, "Sensor HV7131R found"); |
1612 | && gspca_dev->usb_buf[4] == 0x00) { | ||
1613 | PDEBUG(D_PROBE, "Sensor sn9c102P HV7131R found"); | ||
1614 | return; | 1614 | return; |
1615 | } | 1615 | } |
1616 | PDEBUG(D_PROBE, "Sensor 0x%02x 0x%02x 0x%02x - sn9c102P not found", | 1616 | warn("Erroneous HV7131R ID 0x%02x 0x%02x 0x%02x", |
1617 | gspca_dev->usb_buf[0], gspca_dev->usb_buf[1], | 1617 | gspca_dev->usb_buf[0], gspca_dev->usb_buf[1], |
1618 | gspca_dev->usb_buf[2]); | 1618 | gspca_dev->usb_buf[2]); |
1619 | } | 1619 | } |