diff options
Diffstat (limited to 'drivers/media/video/gspca/vc032x.c')
-rw-r--r-- | drivers/media/video/gspca/vc032x.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c index 6caed734a06a..7ee2c8271dcc 100644 --- a/drivers/media/video/gspca/vc032x.c +++ b/drivers/media/video/gspca/vc032x.c | |||
@@ -20,6 +20,8 @@ | |||
20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
24 | |||
23 | #define MODULE_NAME "vc032x" | 25 | #define MODULE_NAME "vc032x" |
24 | 26 | ||
25 | #include "gspca.h" | 27 | #include "gspca.h" |
@@ -3169,7 +3171,7 @@ static void reg_r_i(struct gspca_dev *gspca_dev, | |||
3169 | index, gspca_dev->usb_buf, len, | 3171 | index, gspca_dev->usb_buf, len, |
3170 | 500); | 3172 | 500); |
3171 | if (ret < 0) { | 3173 | if (ret < 0) { |
3172 | err("reg_r err %d", ret); | 3174 | pr_err("reg_r err %d\n", ret); |
3173 | gspca_dev->usb_err = ret; | 3175 | gspca_dev->usb_err = ret; |
3174 | } | 3176 | } |
3175 | } | 3177 | } |
@@ -3210,7 +3212,7 @@ static void reg_w_i(struct gspca_dev *gspca_dev, | |||
3210 | value, index, NULL, 0, | 3212 | value, index, NULL, 0, |
3211 | 500); | 3213 | 500); |
3212 | if (ret < 0) { | 3214 | if (ret < 0) { |
3213 | err("reg_w err %d", ret); | 3215 | pr_err("reg_w err %d\n", ret); |
3214 | gspca_dev->usb_err = ret; | 3216 | gspca_dev->usb_err = ret; |
3215 | } | 3217 | } |
3216 | } | 3218 | } |
@@ -3235,8 +3237,7 @@ static u16 read_sensor_register(struct gspca_dev *gspca_dev, | |||
3235 | 3237 | ||
3236 | reg_r(gspca_dev, 0xa1, 0xb33f, 1); | 3238 | reg_r(gspca_dev, 0xa1, 0xb33f, 1); |
3237 | if (!(gspca_dev->usb_buf[0] & 0x02)) { | 3239 | if (!(gspca_dev->usb_buf[0] & 0x02)) { |
3238 | err("I2c Bus Busy Wait %02x", | 3240 | pr_err("I2c Bus Busy Wait %02x\n", gspca_dev->usb_buf[0]); |
3239 | gspca_dev->usb_buf[0]); | ||
3240 | return 0; | 3241 | return 0; |
3241 | } | 3242 | } |
3242 | reg_w(gspca_dev, 0xa0, address, 0xb33a); | 3243 | reg_w(gspca_dev, 0xa0, address, 0xb33a); |
@@ -3349,7 +3350,7 @@ static void i2c_write(struct gspca_dev *gspca_dev, | |||
3349 | msleep(20); | 3350 | msleep(20); |
3350 | } while (--retry > 0); | 3351 | } while (--retry > 0); |
3351 | if (retry <= 0) | 3352 | if (retry <= 0) |
3352 | err("i2c_write timeout"); | 3353 | pr_err("i2c_write timeout\n"); |
3353 | } | 3354 | } |
3354 | 3355 | ||
3355 | static void put_tab_to_reg(struct gspca_dev *gspca_dev, | 3356 | static void put_tab_to_reg(struct gspca_dev *gspca_dev, |
@@ -3446,7 +3447,7 @@ static int sd_init(struct gspca_dev *gspca_dev) | |||
3446 | 3447 | ||
3447 | switch (sensor) { | 3448 | switch (sensor) { |
3448 | case -1: | 3449 | case -1: |
3449 | err("Unknown sensor..."); | 3450 | pr_err("Unknown sensor...\n"); |
3450 | return -EINVAL; | 3451 | return -EINVAL; |
3451 | case SENSOR_HV7131R: | 3452 | case SENSOR_HV7131R: |
3452 | PDEBUG(D_PROBE, "Find Sensor HV7131R"); | 3453 | PDEBUG(D_PROBE, "Find Sensor HV7131R"); |