diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-03 01:10:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-03 01:10:38 +0200 |
| commit | b601ce0fe3aafadba21cd42eb3d63660010e2a2b (patch) | |
| tree | b56c64c30801a8696e2f8961f9f1b50b44367b90 | |
| parent | Merge branch 'parisc-3.17-8' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | Revert "[media] media: em28xx - remove reset_resume interface" (diff) | |
| download | linux-b601ce0fe3aafadba21cd42eb3d63660010e2a2b.tar.xz linux-b601ce0fe3aafadba21cd42eb3d63660010e2a2b.zip | |
Merge tag 'media/v3.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fix from Mauro Carvalho Chehab:
"One last time regression fix at em28xx. The removal of .reset_resume
broke suspend/resume on this driver for some devices.
There are more fixes to be done for em28xx suspend/resume to be better
handled, but I'm opting to let them to stay for a while at the media
devel tree, in order to get more tests. So, for now, let's just
revert this patch"
* tag 'media/v3.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
Revert "[media] media: em28xx - remove reset_resume interface"
| -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 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, }; |