From: Mauro Carvalho Chehab Date: Fri, 26 Sep 2014 09:53:15 +0000 (-0300) Subject: Revert "[media] media: em28xx - remove reset_resume interface" X-Git-Tag: Ubuntu-5.0.0-8.9~10767^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=90a5dbef1a66e9f55b76ccb83c0ef27c0bd87c27;p=mirror_ubuntu-disco-kernel.git Revert "[media] media: em28xx - remove reset_resume interface" 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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index a7e24848f6c8..9da812b8a786 100644 --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c @@ -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, };