Revert "[media] media: em28xx - remove reset_resume interface"
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>
Fri, 26 Sep 2014 09:53:15 +0000 (06:53 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Mon, 29 Sep 2014 01:25:24 +0000 (22:25 -0300)
The reset_resume call is needed, otherwise it will break resume
on some conditions, depending on the usb ehci/xhci controller.

This reverts commit b89193e0b06f44f48e3bf897a5b5cb4a7aff3359.

Reported-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/usb/em28xx/em28xx-cards.c

index a7e24848f6c8d04e3431d27f20107732bbd12686..9da812b8a7861de75722cf5fcfdbe29e3baf39eb 100644 (file)
@@ -3524,6 +3524,7 @@ static struct usb_driver em28xx_usb_driver = {
        .disconnect = em28xx_usb_disconnect,
        .suspend = em28xx_usb_suspend,
        .resume = em28xx_usb_resume,
+       .reset_resume = em28xx_usb_resume,
        .id_table = em28xx_id_table,
 };