From f4c749c1775404dceef78780f4b804d1c7d97dd0 Mon Sep 17 00:00:00 2001
From: Olivier Grenie <olivier.grenie@dibcom.fr>
Date: Thu, 4 Aug 2011 13:10:03 -0300
Subject: [PATCH] --- yaml --- r: 271647 b: refs/heads/master c:
 680417bb318adc5f1f8f392730776176fbcdedd8 h: refs/heads/master i:   271645:
 dc641b0b901610d2c7c94f3c3f53dc84a711401f   271643:
 873febc669ab92d32effd5a0cb1af8b185e1e319   271639:
 c5774364487f4e8020f3e7d8a91762f29048809d   271631:
 ca1c76a50658eef9a8b08a6f49ab3d896a7762e9   271615:
 e36eb74819f0294a59e678c506f840b3199616c2 v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/media/dvb/dvb-usb/dib0700_core.c | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index f6b86ac6254c..a80a5076e56d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bff469f4167fdabfe15294f375577d7eadbaa1bb
+refs/heads/master: 680417bb318adc5f1f8f392730776176fbcdedd8
diff --git a/trunk/drivers/media/dvb/dvb-usb/dib0700_core.c b/trunk/drivers/media/dvb/dvb-usb/dib0700_core.c
index a224e94325b7..b693ed13602d 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dib0700_core.c
+++ b/trunk/drivers/media/dvb/dvb-usb/dib0700_core.c
@@ -31,7 +31,7 @@ int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion,
 	int ret;
 
 	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-		deb_info("could not acquire lock");
+		err("could not acquire lock");
 		return 0;
 	}
 
@@ -117,7 +117,7 @@ int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_
 	int ret;
 
 	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-		deb_info("could not acquire lock");
+		err("could not acquire lock");
 		return 0;
 	}
 
@@ -138,7 +138,7 @@ static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets)
 
 	if (st->fw_version >= 0x10201) {
 		if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-			deb_info("could not acquire lock");
+			err("could not acquire lock");
 			return 0;
 		}
 
@@ -227,7 +227,7 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg,
 		} else {
 			/* Write request */
 			if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-				deb_info("could not acquire lock");
+				err("could not acquire lock");
 				return 0;
 			}
 			st->buf[0] = REQUEST_NEW_I2C_WRITE;
@@ -273,7 +273,7 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap,
 	if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
 		return -EAGAIN;
 	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-		deb_info("could not acquire lock");
+		err("could not acquire lock");
 		return 0;
 	}
 
@@ -368,7 +368,7 @@ static int dib0700_set_clock(struct dvb_usb_device *d, u8 en_pll,
 	int ret;
 
 	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-		deb_info("could not acquire lock");
+		err("could not acquire lock");
 		return 0;
 	}
 
@@ -400,7 +400,7 @@ int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz)
 		return -EINVAL;
 
 	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-		deb_info("could not acquire lock");
+		err("could not acquire lock");
 		return 0;
 	}
 
@@ -560,7 +560,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
 	}
 
 	if (mutex_lock_interruptible(&adap->dev->usb_mutex) < 0) {
-		deb_info("could not acquire lock");
+		err("could not acquire lock");
 		return 0;
 	}
 
@@ -610,7 +610,7 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type)
 	int new_proto, ret;
 
 	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-		deb_info("could not acquire lock");
+		err("could not acquire lock");
 		return 0;
 	}