diff options
author | Olivier Grenie <olivier.grenie@dibcom.fr> | 2011-08-04 12:10:03 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-08-06 08:40:09 -0400 |
commit | 680417bb318adc5f1f8f392730776176fbcdedd8 (patch) | |
tree | a5ebceb7fe50ec8d820176f32ce1335147013e03 | |
parent | bff469f4167fdabfe15294f375577d7eadbaa1bb (diff) |
[media] dib0700: correct error message
The goal of this patch is to correct a previous patch. In case of error,
the err() function should be used instead of dprintk() function.
[mchehab@redhat.com: as I've replaced dprintk by deb_info, on the the
previous patch, to avoid breaking bisect, I had to fix a merge conflict
on this one]
Signed-off-by: Olivier Grenie <olivier.grenie@dibcom.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/dvb/dvb-usb/dib0700_core.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c index a224e94325b7..b693ed13602d 100644 --- a/drivers/media/dvb/dvb-usb/dib0700_core.c +++ b/drivers/media/dvb/dvb-usb/dib0700_core.c | |||
@@ -31,7 +31,7 @@ int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion, | |||
31 | int ret; | 31 | int ret; |
32 | 32 | ||
33 | if (mutex_lock_interruptible(&d->usb_mutex) < 0) { | 33 | if (mutex_lock_interruptible(&d->usb_mutex) < 0) { |
34 | deb_info("could not acquire lock"); | 34 | err("could not acquire lock"); |
35 | return 0; | 35 | return 0; |
36 | } | 36 | } |
37 | 37 | ||
@@ -117,7 +117,7 @@ int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_ | |||
117 | int ret; | 117 | int ret; |
118 | 118 | ||
119 | if (mutex_lock_interruptible(&d->usb_mutex) < 0) { | 119 | if (mutex_lock_interruptible(&d->usb_mutex) < 0) { |
120 | deb_info("could not acquire lock"); | 120 | err("could not acquire lock"); |
121 | return 0; | 121 | return 0; |
122 | } | 122 | } |
123 | 123 | ||
@@ -138,7 +138,7 @@ static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets) | |||
138 | 138 | ||
139 | if (st->fw_version >= 0x10201) { | 139 | if (st->fw_version >= 0x10201) { |
140 | if (mutex_lock_interruptible(&d->usb_mutex) < 0) { | 140 | if (mutex_lock_interruptible(&d->usb_mutex) < 0) { |
141 | deb_info("could not acquire lock"); | 141 | err("could not acquire lock"); |
142 | return 0; | 142 | return 0; |
143 | } | 143 | } |
144 | 144 | ||
@@ -227,7 +227,7 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, | |||
227 | } else { | 227 | } else { |
228 | /* Write request */ | 228 | /* Write request */ |
229 | if (mutex_lock_interruptible(&d->usb_mutex) < 0) { | 229 | if (mutex_lock_interruptible(&d->usb_mutex) < 0) { |
230 | deb_info("could not acquire lock"); | 230 | err("could not acquire lock"); |
231 | return 0; | 231 | return 0; |
232 | } | 232 | } |
233 | st->buf[0] = REQUEST_NEW_I2C_WRITE; | 233 | st->buf[0] = REQUEST_NEW_I2C_WRITE; |
@@ -273,7 +273,7 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap, | |||
273 | if (mutex_lock_interruptible(&d->i2c_mutex) < 0) | 273 | if (mutex_lock_interruptible(&d->i2c_mutex) < 0) |
274 | return -EAGAIN; | 274 | return -EAGAIN; |
275 | if (mutex_lock_interruptible(&d->usb_mutex) < 0) { | 275 | if (mutex_lock_interruptible(&d->usb_mutex) < 0) { |
276 | deb_info("could not acquire lock"); | 276 | err("could not acquire lock"); |
277 | return 0; | 277 | return 0; |
278 | } | 278 | } |
279 | 279 | ||
@@ -368,7 +368,7 @@ static int dib0700_set_clock(struct dvb_usb_device *d, u8 en_pll, | |||
368 | int ret; | 368 | int ret; |
369 | 369 | ||
370 | if (mutex_lock_interruptible(&d->usb_mutex) < 0) { | 370 | if (mutex_lock_interruptible(&d->usb_mutex) < 0) { |
371 | deb_info("could not acquire lock"); | 371 | err("could not acquire lock"); |
372 | return 0; | 372 | return 0; |
373 | } | 373 | } |
374 | 374 | ||
@@ -400,7 +400,7 @@ int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz) | |||
400 | return -EINVAL; | 400 | return -EINVAL; |
401 | 401 | ||
402 | if (mutex_lock_interruptible(&d->usb_mutex) < 0) { | 402 | if (mutex_lock_interruptible(&d->usb_mutex) < 0) { |
403 | deb_info("could not acquire lock"); | 403 | err("could not acquire lock"); |
404 | return 0; | 404 | return 0; |
405 | } | 405 | } |
406 | 406 | ||
@@ -560,7 +560,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) | |||
560 | } | 560 | } |
561 | 561 | ||
562 | if (mutex_lock_interruptible(&adap->dev->usb_mutex) < 0) { | 562 | if (mutex_lock_interruptible(&adap->dev->usb_mutex) < 0) { |
563 | deb_info("could not acquire lock"); | 563 | err("could not acquire lock"); |
564 | return 0; | 564 | return 0; |
565 | } | 565 | } |
566 | 566 | ||
@@ -610,7 +610,7 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type) | |||
610 | int new_proto, ret; | 610 | int new_proto, ret; |
611 | 611 | ||
612 | if (mutex_lock_interruptible(&d->usb_mutex) < 0) { | 612 | if (mutex_lock_interruptible(&d->usb_mutex) < 0) { |
613 | deb_info("could not acquire lock"); | 613 | err("could not acquire lock"); |
614 | return 0; | 614 | return 0; |
615 | } | 615 | } |
616 | 616 | ||