diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2008-09-03 16:12:15 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-03 17:37:32 -0400 |
commit | 1e89e2da48070da8ac221c37fea8fa82da127c34 (patch) | |
tree | 26f748e74c1bccb4d36dd0d880cd926b5f03cb44 | |
parent | 65f33396ab57f3346fb07ddee8e3aa616d13386c (diff) |
V4L/DVB (8818): gspca: Reinitialize the device on resume.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/gspca/gspca.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index e7e73ec7134c..1767991c1f4b 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c | |||
@@ -1838,9 +1838,12 @@ int gspca_resume(struct usb_interface *intf) | |||
1838 | struct gspca_dev *gspca_dev = usb_get_intfdata(intf); | 1838 | struct gspca_dev *gspca_dev = usb_get_intfdata(intf); |
1839 | 1839 | ||
1840 | gspca_dev->frozen = 0; | 1840 | gspca_dev->frozen = 0; |
1841 | if (!gspca_dev->streaming) | 1841 | if (gspca_dev->users != 0) { |
1842 | return 0; | 1842 | gspca_dev->sd_desc->open(gspca_dev); |
1843 | return gspca_init_transfer(gspca_dev); | 1843 | if (gspca_dev->streaming) |
1844 | return gspca_init_transfer(gspca_dev); | ||
1845 | } | ||
1846 | return 0; | ||
1844 | } | 1847 | } |
1845 | EXPORT_SYMBOL(gspca_resume); | 1848 | EXPORT_SYMBOL(gspca_resume); |
1846 | #endif | 1849 | #endif |