]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[media] dib0700: do not lock interruptible on tear-down paths
authorJiri Slaby <jslaby@suse.cz>
Thu, 3 Jan 2013 15:53:53 +0000 (12:53 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 6 Jan 2013 12:42:33 +0000 (10:42 -0200)
When mutex_lock_interruptible is used on paths where a signal can be
pending, the device is not closed properly and cannot be reused.
This usually happens when you start tzap for example and send it a
TERM signal. The signal is pending while tear-down routines are
called. Hence streaming is not properly stopped in that case. And
the device stops working from that moment on.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/usb/dvb-usb/dib0700_core.c

index 19b5ed2825d719d656066b26af8aea2250151960..bf2a908d74cf3a804fe34eededac8157ab20aa0f 100644 (file)
@@ -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,