summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2010-11-16 12:26:00 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 08:16:52 -0200
commitc7d18867c82657a97f0bdb90ba1151b251b6a29b (patch)
tree5ed03e905b120ac30d25b97d4f681eb361a60d5f
parent3751e288bcf3d77652ef979edc0b3ea8b21d8b97 (diff)
downloadlinux-stable-c7d18867c82657a97f0bdb90ba1151b251b6a29b.tar.gz
linux-stable-c7d18867c82657a97f0bdb90ba1151b251b6a29b.tar.bz2
linux-stable-c7d18867c82657a97f0bdb90ba1151b251b6a29b.zip
[media] pwc: Also set alt setting to alt0 when no error occured
isoc_cleanup contains a check to not set the altsetting to alt0 when the device was unplugged, but the check currently is buggy, and causes the alt setting to only be set to 0 if an error occured while streaming. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/pwc/pwc-if.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 6f8b682b9245..97319efc9948 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -957,7 +957,7 @@ void pwc_isoc_cleanup(struct pwc_device *pdev)
/* Stop camera, but only if we are sure the camera is still there (unplug
is signalled by EPIPE)
*/
- if (pdev->error_status && pdev->error_status != EPIPE) {
+ if (pdev->error_status != EPIPE) {
PWC_DEBUG_OPEN("Setting alternate interface 0.\n");
usb_set_interface(pdev->udev, 0, 0);
}