diff options
Diffstat (limited to 'drivers/media/video/gspca/zc3xx.c')
| -rw-r--r-- | drivers/media/video/gspca/zc3xx.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c index 61cdd56a74a9..30ea1e479492 100644 --- a/drivers/media/video/gspca/zc3xx.c +++ b/drivers/media/video/gspca/zc3xx.c | |||
| @@ -19,6 +19,8 @@ | |||
| 19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
| 23 | |||
| 22 | #define MODULE_NAME "zc3xx" | 24 | #define MODULE_NAME "zc3xx" |
| 23 | 25 | ||
| 24 | #include <linux/input.h> | 26 | #include <linux/input.h> |
| @@ -5666,7 +5668,7 @@ static u8 reg_r_i(struct gspca_dev *gspca_dev, | |||
| 5666 | index, gspca_dev->usb_buf, 1, | 5668 | index, gspca_dev->usb_buf, 1, |
| 5667 | 500); | 5669 | 500); |
| 5668 | if (ret < 0) { | 5670 | if (ret < 0) { |
| 5669 | err("reg_r_i err %d", ret); | 5671 | pr_err("reg_r_i err %d\n", ret); |
| 5670 | gspca_dev->usb_err = ret; | 5672 | gspca_dev->usb_err = ret; |
| 5671 | return 0; | 5673 | return 0; |
| 5672 | } | 5674 | } |
| @@ -5698,7 +5700,7 @@ static void reg_w_i(struct gspca_dev *gspca_dev, | |||
| 5698 | value, index, NULL, 0, | 5700 | value, index, NULL, 0, |
| 5699 | 500); | 5701 | 500); |
| 5700 | if (ret < 0) { | 5702 | if (ret < 0) { |
| 5701 | err("reg_w_i err %d", ret); | 5703 | pr_err("reg_w_i err %d\n", ret); |
| 5702 | gspca_dev->usb_err = ret; | 5704 | gspca_dev->usb_err = ret; |
| 5703 | } | 5705 | } |
| 5704 | } | 5706 | } |
| @@ -5724,7 +5726,7 @@ static u16 i2c_read(struct gspca_dev *gspca_dev, | |||
| 5724 | msleep(20); | 5726 | msleep(20); |
| 5725 | retbyte = reg_r_i(gspca_dev, 0x0091); /* read status */ | 5727 | retbyte = reg_r_i(gspca_dev, 0x0091); /* read status */ |
| 5726 | if (retbyte != 0x00) | 5728 | if (retbyte != 0x00) |
| 5727 | err("i2c_r status error %02x", retbyte); | 5729 | pr_err("i2c_r status error %02x\n", retbyte); |
| 5728 | retval = reg_r_i(gspca_dev, 0x0095); /* read Lowbyte */ | 5730 | retval = reg_r_i(gspca_dev, 0x0095); /* read Lowbyte */ |
| 5729 | retval |= reg_r_i(gspca_dev, 0x0096) << 8; /* read Hightbyte */ | 5731 | retval |= reg_r_i(gspca_dev, 0x0096) << 8; /* read Hightbyte */ |
| 5730 | PDEBUG(D_USBI, "i2c r [%02x] -> %04x (%02x)", | 5732 | PDEBUG(D_USBI, "i2c r [%02x] -> %04x (%02x)", |
| @@ -5748,7 +5750,7 @@ static u8 i2c_write(struct gspca_dev *gspca_dev, | |||
| 5748 | msleep(1); | 5750 | msleep(1); |
| 5749 | retbyte = reg_r_i(gspca_dev, 0x0091); /* read status */ | 5751 | retbyte = reg_r_i(gspca_dev, 0x0091); /* read status */ |
| 5750 | if (retbyte != 0x00) | 5752 | if (retbyte != 0x00) |
| 5751 | err("i2c_w status error %02x", retbyte); | 5753 | pr_err("i2c_w status error %02x\n", retbyte); |
| 5752 | PDEBUG(D_USBO, "i2c w [%02x] = %02x%02x (%02x)", | 5754 | PDEBUG(D_USBO, "i2c w [%02x] = %02x%02x (%02x)", |
| 5753 | reg, valH, valL, retbyte); | 5755 | reg, valH, valL, retbyte); |
| 5754 | return retbyte; | 5756 | return retbyte; |
| @@ -6497,7 +6499,7 @@ static int sd_init(struct gspca_dev *gspca_dev) | |||
| 6497 | PDEBUG(D_PROBE, "Sensor GC0303"); | 6499 | PDEBUG(D_PROBE, "Sensor GC0303"); |
| 6498 | break; | 6500 | break; |
| 6499 | default: | 6501 | default: |
| 6500 | warn("Unknown sensor - set to TAS5130C"); | 6502 | pr_warn("Unknown sensor - set to TAS5130C\n"); |
| 6501 | sd->sensor = SENSOR_TAS5130C; | 6503 | sd->sensor = SENSOR_TAS5130C; |
| 6502 | } | 6504 | } |
| 6503 | break; | 6505 | break; |
| @@ -6603,7 +6605,7 @@ static int sd_init(struct gspca_dev *gspca_dev) | |||
| 6603 | sd->sensor = SENSOR_OV7620; /* same sensor (?) */ | 6605 | sd->sensor = SENSOR_OV7620; /* same sensor (?) */ |
| 6604 | break; | 6606 | break; |
| 6605 | default: | 6607 | default: |
| 6606 | err("Unknown sensor %04x", sensor); | 6608 | pr_err("Unknown sensor %04x\n", sensor); |
| 6607 | return -EINVAL; | 6609 | return -EINVAL; |
| 6608 | } | 6610 | } |
| 6609 | } | 6611 | } |
| @@ -6970,6 +6972,7 @@ static const struct sd_desc sd_desc = { | |||
| 6970 | }; | 6972 | }; |
| 6971 | 6973 | ||
| 6972 | static const struct usb_device_id device_table[] = { | 6974 | static const struct usb_device_id device_table[] = { |
| 6975 | {USB_DEVICE(0x03f0, 0x1b07)}, | ||
| 6973 | {USB_DEVICE(0x041e, 0x041e)}, | 6976 | {USB_DEVICE(0x041e, 0x041e)}, |
| 6974 | {USB_DEVICE(0x041e, 0x4017)}, | 6977 | {USB_DEVICE(0x041e, 0x4017)}, |
| 6975 | {USB_DEVICE(0x041e, 0x401c), .driver_info = SENSOR_PAS106}, | 6978 | {USB_DEVICE(0x041e, 0x401c), .driver_info = SENSOR_PAS106}, |
