summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-09-26 06:53:15 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-09-28 22:25:24 -0300
commit90a5dbef1a66e9f55b76ccb83c0ef27c0bd87c27 (patch)
treea8d35704d1818cc6610fc7ed070d6a068ec91b38
parent8e2c8717c1812628b5538c05250057b37c66fdbe (diff)
downloadop-kernel-dev-90a5dbef1a66e9f55b76ccb83c0ef27c0bd87c27.zip
op-kernel-dev-90a5dbef1a66e9f55b76ccb83c0ef27c0bd87c27.tar.gz
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 <js@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/usb/em28xx/em28xx-cards.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index a7e24848..9da812b 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,
};
OpenPOWER on IntegriCloud