diff options
author | Jean-François Moine <moinejf@free.fr> | 2010-09-13 04:19:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:05:53 -0400 |
commit | 0b656321f338a2e5e3d9a9bdce959a2d76857967 (patch) | |
tree | 2f1581be1e243ace0cb25a255b71aa09fc4aa2ce /drivers/media/video/gspca/stk014.c | |
parent | 548264375b1c0d51b418bf7ab6d2fec647307ab7 (diff) |
V4L/DVB: gspca - all modules: Display error messages when gspca debug disabled
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/stk014.c')
-rw-r--r-- | drivers/media/video/gspca/stk014.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c index 3266a5397170..14601d887c4f 100644 --- a/drivers/media/video/gspca/stk014.c +++ b/drivers/media/video/gspca/stk014.c | |||
@@ -142,7 +142,7 @@ static u8 reg_r(struct gspca_dev *gspca_dev, | |||
142 | gspca_dev->usb_buf, 1, | 142 | gspca_dev->usb_buf, 1, |
143 | 500); | 143 | 500); |
144 | if (ret < 0) { | 144 | if (ret < 0) { |
145 | PDEBUG(D_ERR, "reg_r err %d", ret); | 145 | err("reg_r err %d", ret); |
146 | gspca_dev->usb_err = ret; | 146 | gspca_dev->usb_err = ret; |
147 | return 0; | 147 | return 0; |
148 | } | 148 | } |
@@ -167,7 +167,7 @@ static void reg_w(struct gspca_dev *gspca_dev, | |||
167 | 0, | 167 | 0, |
168 | 500); | 168 | 500); |
169 | if (ret < 0) { | 169 | if (ret < 0) { |
170 | PDEBUG(D_ERR, "reg_w err %d", ret); | 170 | err("reg_w err %d", ret); |
171 | gspca_dev->usb_err = ret; | 171 | gspca_dev->usb_err = ret; |
172 | } | 172 | } |
173 | } | 173 | } |
@@ -197,7 +197,7 @@ static void rcv_val(struct gspca_dev *gspca_dev, | |||
197 | &alen, | 197 | &alen, |
198 | 500); /* timeout in milliseconds */ | 198 | 500); /* timeout in milliseconds */ |
199 | if (ret < 0) { | 199 | if (ret < 0) { |
200 | PDEBUG(D_ERR, "rcv_val err %d", ret); | 200 | err("rcv_val err %d", ret); |
201 | gspca_dev->usb_err = ret; | 201 | gspca_dev->usb_err = ret; |
202 | } | 202 | } |
203 | } | 203 | } |
@@ -240,7 +240,7 @@ static void snd_val(struct gspca_dev *gspca_dev, | |||
240 | &alen, | 240 | &alen, |
241 | 500); /* timeout in milliseconds */ | 241 | 500); /* timeout in milliseconds */ |
242 | if (ret < 0) { | 242 | if (ret < 0) { |
243 | PDEBUG(D_ERR, "snd_val err %d", ret); | 243 | err("snd_val err %d", ret); |
244 | gspca_dev->usb_err = ret; | 244 | gspca_dev->usb_err = ret; |
245 | } else { | 245 | } else { |
246 | if (ads == 0x003f08) { | 246 | if (ads == 0x003f08) { |
@@ -323,7 +323,7 @@ static int sd_init(struct gspca_dev *gspca_dev) | |||
323 | ret = reg_r(gspca_dev, 0x0740); | 323 | ret = reg_r(gspca_dev, 0x0740); |
324 | if (gspca_dev->usb_err >= 0) { | 324 | if (gspca_dev->usb_err >= 0) { |
325 | if (ret != 0xff) { | 325 | if (ret != 0xff) { |
326 | PDEBUG(D_ERR|D_STREAM, "init reg: 0x%02x", ret); | 326 | err("init reg: 0x%02x", ret); |
327 | gspca_dev->usb_err = -EIO; | 327 | gspca_dev->usb_err = -EIO; |
328 | } | 328 | } |
329 | } | 329 | } |
@@ -357,7 +357,7 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
357 | gspca_dev->iface, | 357 | gspca_dev->iface, |
358 | gspca_dev->alt); | 358 | gspca_dev->alt); |
359 | if (ret < 0) { | 359 | if (ret < 0) { |
360 | PDEBUG(D_ERR|D_STREAM, "set intf %d %d failed", | 360 | err("set intf %d %d failed", |
361 | gspca_dev->iface, gspca_dev->alt); | 361 | gspca_dev->iface, gspca_dev->alt); |
362 | gspca_dev->usb_err = ret; | 362 | gspca_dev->usb_err = ret; |
363 | goto out; | 363 | goto out; |