diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-09-26 06:53:15 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-09-26 06:53:15 -0300 |
| commit | 214635f94dc3e4069b05817e5d55b58784ba8971 (patch) | |
| tree | 181e27bd15a1d7bafeb0ad0ed3ee9702276ae02f /drivers/media | |
| parent | 7d4020c3c400260ea0601a74eace1cb071f01dd3 (diff) | |
| download | linux-214635f94dc3e4069b05817e5d55b58784ba8971.tar.bz2 | |
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx-cards.c | 1 |
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 f1425882a843..71fa51e7984e 100644 --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c @@ -3515,6 +3515,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, }; |