diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
| commit | d04cdb64212eb5ae6a98026a97dda626e40e8e9a (patch) | |
| tree | b6a7dbb21ccfceb915844e9a330b3d3dfcaf3c5b /drivers/media/dvb/dvb-usb/digitv.c | |
| parent | 2f8600dff2b140096a7df781884e918a16aa90e0 (diff) | |
| parent | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/media/dvb/dvb-usb/digitv.c')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/digitv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c index caa1346e3063..91136c00ce9d 100644 --- a/drivers/media/dvb/dvb-usb/digitv.c +++ b/drivers/media/dvb/dvb-usb/digitv.c | |||
| @@ -48,7 +48,7 @@ static int digitv_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num | |||
| 48 | struct dvb_usb_device *d = i2c_get_adapdata(adap); | 48 | struct dvb_usb_device *d = i2c_get_adapdata(adap); |
| 49 | int i; | 49 | int i; |
| 50 | 50 | ||
| 51 | if (down_interruptible(&d->i2c_sem) < 0) | 51 | if (mutex_lock_interruptible(&d->i2c_mutex) < 0) |
| 52 | return -EAGAIN; | 52 | return -EAGAIN; |
| 53 | 53 | ||
| 54 | if (num > 2) | 54 | if (num > 2) |
| @@ -67,7 +67,7 @@ static int digitv_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num | |||
| 67 | break; | 67 | break; |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | up(&d->i2c_sem); | 70 | mutex_unlock(&d->i2c_mutex); |
| 71 | return i; | 71 | return i; |
| 72 | } | 72 | } |
| 73 | 73 | ||