From d1fa77537e63243e5d6477cdd7a78a5332535507 Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Thu, 10 Jan 2013 07:04:55 -0300 Subject: [PATCH] --- yaml --- r: 357386 b: refs/heads/master c: a82a45f65377b05fe8cd3167c7b0a70c508356b8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/uvc/uvc_v4l2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c16be58417a4..14677184f9e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c0d44e250735b09e255ce0483c47eb2f68d3fa7 +refs/heads/master: a82a45f65377b05fe8cd3167c7b0a70c508356b8 diff --git a/trunk/drivers/media/usb/uvc/uvc_v4l2.c b/trunk/drivers/media/usb/uvc/uvc_v4l2.c index 97a4ffde5d6f..b2dc32623a71 100644 --- a/trunk/drivers/media/usb/uvc/uvc_v4l2.c +++ b/trunk/drivers/media/usb/uvc/uvc_v4l2.c @@ -501,8 +501,8 @@ static int uvc_v4l2_open(struct file *file) if (atomic_inc_return(&stream->dev->users) == 1) { ret = uvc_status_start(stream->dev); if (ret < 0) { - usb_autopm_put_interface(stream->dev->intf); atomic_dec(&stream->dev->users); + usb_autopm_put_interface(stream->dev->intf); kfree(handle); return ret; }