[media] gspca: Add reset_resume callback to all sub-drivers
1) The gspca-core's suspend/resume code is such that resume being called after a reset is safe / ok. 2) All devices tested sofar seem to need the reset_resume callback to work properly over a suspend 3) The USB-core won't call the reset_resume callback for devices which don't need it Thus it seems the simplest and the best to just add the callback to all sub-drivers, rather then adding the callbacks one-by-one as each driver gets tested with suspend/resume. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
1289179404
commit
8bb58964bc
41 changed files with 41 additions and 2 deletions
|
@ -282,6 +282,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -959,6 +959,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -1898,6 +1898,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -792,6 +792,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -299,6 +299,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -521,6 +521,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -541,6 +541,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -505,8 +505,6 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
|
|||
/* sub-driver description */
|
||||
static const struct sd_desc sd_desc = {
|
||||
.name = MODULE_NAME,
|
||||
/* .ctrls = none have been detected */
|
||||
/* .nctrls = ARRAY_SIZE(sd_ctrls), */
|
||||
.config = sd_config,
|
||||
.init = sd_init,
|
||||
.start = sd_start,
|
||||
|
@ -536,6 +534,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -401,6 +401,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -472,6 +472,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -400,6 +400,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
.disconnect = m5602_disconnect
|
||||
};
|
||||
|
|
|
@ -1084,6 +1084,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -2087,6 +2087,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -4981,6 +4981,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -1537,6 +1537,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -1493,6 +1493,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -462,6 +462,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -925,6 +925,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -694,6 +694,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -730,6 +730,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
.pre_reset = sd_pre_reset,
|
||||
.post_reset = sd_post_reset,
|
||||
|
|
|
@ -734,6 +734,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -1486,6 +1486,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -3199,6 +3199,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -437,6 +437,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -983,6 +983,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -2047,6 +2047,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -800,6 +800,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -605,6 +605,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -1533,6 +1533,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -922,6 +922,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -433,6 +433,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -340,6 +340,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -1165,6 +1165,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -439,6 +439,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -352,6 +352,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -1078,6 +1078,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -1043,6 +1043,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -371,6 +371,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -3846,6 +3846,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -358,6 +358,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -3135,6 +3135,7 @@ static struct usb_driver sd_driver = {
|
|||
#ifdef CONFIG_PM
|
||||
.suspend = gspca_suspend,
|
||||
.resume = gspca_resume,
|
||||
.reset_resume = gspca_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue