Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 271647
b: refs/heads/master
c: 680417b
h: refs/heads/master
i:
  271645: dc641b0
  271643: 873febc
  271639: c577436
  271631: ca1c76a
  271615: e36eb74
v: v3
  • Loading branch information
Olivier Grenie authored and Mauro Carvalho Chehab committed Aug 6, 2011
1 parent 08466d1 commit f4c749c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bff469f4167fdabfe15294f375577d7eadbaa1bb
refs/heads/master: 680417bb318adc5f1f8f392730776176fbcdedd8
18 changes: 9 additions & 9 deletions trunk/drivers/media/dvb/dvb-usb/dib0700_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit f4c749c

Please sign in to comment.