aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/stk014.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/gspca/stk014.c')
-rw-r--r--drivers/media/video/gspca/stk014.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c
index 763747700f10..42a7a28a6c8b 100644
--- a/drivers/media/video/gspca/stk014.c
+++ b/drivers/media/video/gspca/stk014.c
@@ -18,6 +18,8 @@
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 */ 19 */
20 20
21#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
22
21#define MODULE_NAME "stk014" 23#define MODULE_NAME "stk014"
22 24
23#include "gspca.h" 25#include "gspca.h"
@@ -137,7 +139,7 @@ static u8 reg_r(struct gspca_dev *gspca_dev,
137 gspca_dev->usb_buf, 1, 139 gspca_dev->usb_buf, 1,
138 500); 140 500);
139 if (ret < 0) { 141 if (ret < 0) {
140 err("reg_r err %d", ret); 142 pr_err("reg_r err %d\n", ret);
141 gspca_dev->usb_err = ret; 143 gspca_dev->usb_err = ret;
142 return 0; 144 return 0;
143 } 145 }
@@ -162,7 +164,7 @@ static void reg_w(struct gspca_dev *gspca_dev,
162 0, 164 0,
163 500); 165 500);
164 if (ret < 0) { 166 if (ret < 0) {
165 err("reg_w err %d", ret); 167 pr_err("reg_w err %d\n", ret);
166 gspca_dev->usb_err = ret; 168 gspca_dev->usb_err = ret;
167 } 169 }
168} 170}
@@ -192,7 +194,7 @@ static void rcv_val(struct gspca_dev *gspca_dev,
192 &alen, 194 &alen,
193 500); /* timeout in milliseconds */ 195 500); /* timeout in milliseconds */
194 if (ret < 0) { 196 if (ret < 0) {
195 err("rcv_val err %d", ret); 197 pr_err("rcv_val err %d\n", ret);
196 gspca_dev->usb_err = ret; 198 gspca_dev->usb_err = ret;
197 } 199 }
198} 200}
@@ -235,7 +237,7 @@ static void snd_val(struct gspca_dev *gspca_dev,
235 &alen, 237 &alen,
236 500); /* timeout in milliseconds */ 238 500); /* timeout in milliseconds */
237 if (ret < 0) { 239 if (ret < 0) {
238 err("snd_val err %d", ret); 240 pr_err("snd_val err %d\n", ret);
239 gspca_dev->usb_err = ret; 241 gspca_dev->usb_err = ret;
240 } else { 242 } else {
241 if (ads == 0x003f08) { 243 if (ads == 0x003f08) {
@@ -315,7 +317,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
315 ret = reg_r(gspca_dev, 0x0740); 317 ret = reg_r(gspca_dev, 0x0740);
316 if (gspca_dev->usb_err >= 0) { 318 if (gspca_dev->usb_err >= 0) {
317 if (ret != 0xff) { 319 if (ret != 0xff) {
318 err("init reg: 0x%02x", ret); 320 pr_err("init reg: 0x%02x\n", ret);
319 gspca_dev->usb_err = -EIO; 321 gspca_dev->usb_err = -EIO;
320 } 322 }
321 } 323 }
@@ -349,8 +351,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
349 gspca_dev->iface, 351 gspca_dev->iface,
350 gspca_dev->alt); 352 gspca_dev->alt);
351 if (ret < 0) { 353 if (ret < 0) {
352 err("set intf %d %d failed", 354 pr_err("set intf %d %d failed\n",
353 gspca_dev->iface, gspca_dev->alt); 355 gspca_dev->iface, gspca_dev->alt);
354 gspca_dev->usb_err = ret; 356 gspca_dev->usb_err = ret;
355 goto out; 357 goto out;
356 } 358 }