diff --git a/[refs] b/[refs] index 622b3c6c6393..2ede51258bbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bbe880b4a7c66ba14b67ee7acfbaaaa1c7be2d03 +refs/heads/master: cecc2471ea719a359b253449781a584e319d8909 diff --git a/trunk/drivers/media/video/pwc/pwc-if.c b/trunk/drivers/media/video/pwc/pwc-if.c index 780af5f81642..356cd42b593b 100644 --- a/trunk/drivers/media/video/pwc/pwc-if.c +++ b/trunk/drivers/media/video/pwc/pwc-if.c @@ -1850,7 +1850,6 @@ static void usb_pwc_disconnect(struct usb_interface *intf) } else { /* Device is closed, so we can safely unregister it */ PWC_DEBUG_PROBE("Unregistering video device in disconnect().\n"); - pwc_cleanup(pdev); disconnect_out: /* search device_hint[] table if we occupy a slot, by any chance */ @@ -1860,6 +1859,7 @@ static void usb_pwc_disconnect(struct usb_interface *intf) } mutex_unlock(&pdev->modlock); + pwc_cleanup(pdev); }