diff options
| -rw-r--r-- | drivers/media/usb/gspca/sonixb.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/media/usb/gspca/sonixb.c b/drivers/media/usb/gspca/sonixb.c index 70511d5f9538..1220340e7602 100644 --- a/drivers/media/usb/gspca/sonixb.c +++ b/drivers/media/usb/gspca/sonixb.c | |||
| @@ -496,7 +496,7 @@ static void reg_w(struct gspca_dev *gspca_dev, | |||
| 496 | } | 496 | } |
| 497 | } | 497 | } |
| 498 | 498 | ||
| 499 | static void i2c_w(struct gspca_dev *gspca_dev, const __u8 *buffer) | 499 | static void i2c_w(struct gspca_dev *gspca_dev, const u8 *buf) |
| 500 | { | 500 | { |
| 501 | int retry = 60; | 501 | int retry = 60; |
| 502 | 502 | ||
| @@ -504,16 +504,19 @@ static void i2c_w(struct gspca_dev *gspca_dev, const __u8 *buffer) | |||
| 504 | return; | 504 | return; |
| 505 | 505 | ||
| 506 | /* is i2c ready */ | 506 | /* is i2c ready */ |
| 507 | reg_w(gspca_dev, 0x08, buffer, 8); | 507 | reg_w(gspca_dev, 0x08, buf, 8); |
| 508 | while (retry--) { | 508 | while (retry--) { |
| 509 | if (gspca_dev->usb_err < 0) | 509 | if (gspca_dev->usb_err < 0) |
| 510 | return; | 510 | return; |
| 511 | msleep(10); | 511 | msleep(1); |
| 512 | reg_r(gspca_dev, 0x08); | 512 | reg_r(gspca_dev, 0x08); |
| 513 | if (gspca_dev->usb_buf[0] & 0x04) { | 513 | if (gspca_dev->usb_buf[0] & 0x04) { |
| 514 | if (gspca_dev->usb_buf[0] & 0x08) { | 514 | if (gspca_dev->usb_buf[0] & 0x08) { |
| 515 | dev_err(gspca_dev->v4l2_dev.dev, | 515 | dev_err(gspca_dev->v4l2_dev.dev, |
| 516 | "i2c write error\n"); | 516 | "i2c error writing %02x %02x %02x %02x" |
| 517 | " %02x %02x %02x %02x\n", | ||
| 518 | buf[0], buf[1], buf[2], buf[3], | ||
| 519 | buf[4], buf[5], buf[6], buf[7]); | ||
| 517 | gspca_dev->usb_err = -EIO; | 520 | gspca_dev->usb_err = -EIO; |
| 518 | } | 521 | } |
| 519 | return; | 522 | return; |
| @@ -530,7 +533,7 @@ static void i2c_w_vector(struct gspca_dev *gspca_dev, | |||
| 530 | for (;;) { | 533 | for (;;) { |
| 531 | if (gspca_dev->usb_err < 0) | 534 | if (gspca_dev->usb_err < 0) |
| 532 | return; | 535 | return; |
| 533 | reg_w(gspca_dev, 0x08, *buffer, 8); | 536 | i2c_w(gspca_dev, *buffer); |
| 534 | len -= 8; | 537 | len -= 8; |
| 535 | if (len <= 0) | 538 | if (len <= 0) |
| 536 | break; | 539 | break; |
