From 295db1dfbcdc9dc167a812e40960eec26adbe8d6 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 3 Jan 2013 12:53:53 -0300 Subject: [PATCH] --- yaml --- r: 357345 b: refs/heads/master c: a96fbe0429ace98bf3d92340ab9caa03c80db88c h: refs/heads/master i: 357343: fad3d5949b9147a8303d168dbcb722bc50470f62 v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/dvb-usb/dib0700_core.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 95c8e0c18b04..1b29abb68bf8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c612e9a1cf712bd7845e3adb4961e3ef8eaf8aa +refs/heads/master: a96fbe0429ace98bf3d92340ab9caa03c80db88c diff --git a/trunk/drivers/media/usb/dvb-usb/dib0700_core.c b/trunk/drivers/media/usb/dvb-usb/dib0700_core.c index 19b5ed2825d7..bf2a908d74cf 100644 --- a/trunk/drivers/media/usb/dvb-usb/dib0700_core.c +++ b/trunk/drivers/media/usb/dvb-usb/dib0700_core.c @@ -561,10 +561,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) } } - if (mutex_lock_interruptible(&adap->dev->usb_mutex) < 0) { - err("could not acquire lock"); - return -EINTR; - } + mutex_lock(&adap->dev->usb_mutex); st->buf[0] = REQUEST_ENABLE_VIDEO; /* this bit gives a kind of command,