Browse Source

[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>
Hans de Goede 13 years ago
parent
commit
8bb58964bc
41 changed files with 41 additions and 2 deletions
  1. 1 0
      drivers/media/video/gspca/benq.c
  2. 1 0
      drivers/media/video/gspca/conex.c
  3. 1 0
      drivers/media/video/gspca/cpia1.c
  4. 1 0
      drivers/media/video/gspca/etoms.c
  5. 1 0
      drivers/media/video/gspca/finepix.c
  6. 1 0
      drivers/media/video/gspca/gl860/gl860.c
  7. 1 0
      drivers/media/video/gspca/jeilinj.c
  8. 1 2
      drivers/media/video/gspca/jl2005bcd.c
  9. 1 0
      drivers/media/video/gspca/kinect.c
  10. 1 0
      drivers/media/video/gspca/konica.c
  11. 1 0
      drivers/media/video/gspca/m5602/m5602_core.c
  12. 1 0
      drivers/media/video/gspca/mr97310a.c
  13. 1 0
      drivers/media/video/gspca/nw80x.c
  14. 1 0
      drivers/media/video/gspca/ov519.c
  15. 1 0
      drivers/media/video/gspca/ov534.c
  16. 1 0
      drivers/media/video/gspca/ov534_9.c
  17. 1 0
      drivers/media/video/gspca/pac207.c
  18. 1 0
      drivers/media/video/gspca/pac7302.c
  19. 1 0
      drivers/media/video/gspca/pac7311.c
  20. 1 0
      drivers/media/video/gspca/se401.c
  21. 1 0
      drivers/media/video/gspca/sn9c2028.c
  22. 1 0
      drivers/media/video/gspca/sonixb.c
  23. 1 0
      drivers/media/video/gspca/sonixj.c
  24. 1 0
      drivers/media/video/gspca/spca1528.c
  25. 1 0
      drivers/media/video/gspca/spca500.c
  26. 1 0
      drivers/media/video/gspca/spca501.c
  27. 1 0
      drivers/media/video/gspca/spca505.c
  28. 1 0
      drivers/media/video/gspca/spca506.c
  29. 1 0
      drivers/media/video/gspca/spca508.c
  30. 1 0
      drivers/media/video/gspca/spca561.c
  31. 1 0
      drivers/media/video/gspca/sq905.c
  32. 1 0
      drivers/media/video/gspca/sq905c.c
  33. 1 0
      drivers/media/video/gspca/sq930x.c
  34. 1 0
      drivers/media/video/gspca/stk014.c
  35. 1 0
      drivers/media/video/gspca/stv0680.c
  36. 1 0
      drivers/media/video/gspca/sunplus.c
  37. 1 0
      drivers/media/video/gspca/t613.c
  38. 1 0
      drivers/media/video/gspca/tv8532.c
  39. 1 0
      drivers/media/video/gspca/vc032x.c
  40. 1 0
      drivers/media/video/gspca/vicam.c
  41. 1 0
      drivers/media/video/gspca/xirlink_cit.c

+ 1 - 0
drivers/media/video/gspca/benq.c

@@ -282,6 +282,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/conex.c

@@ -959,6 +959,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/cpia1.c

@@ -1898,6 +1898,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/etoms.c

@@ -792,6 +792,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/finepix.c

@@ -299,6 +299,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume  = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/gl860/gl860.c

@@ -521,6 +521,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend    = gspca_suspend,
 	.resume     = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/jeilinj.c

@@ -541,6 +541,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume  = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 2
drivers/media/video/gspca/jl2005bcd.c

@@ -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
 };
 

+ 1 - 0
drivers/media/video/gspca/kinect.c

@@ -401,6 +401,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend    = gspca_suspend,
 	.resume     = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/konica.c

@@ -472,6 +472,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/m5602/m5602_core.c

@@ -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
 };

+ 1 - 0
drivers/media/video/gspca/mr97310a.c

@@ -1084,6 +1084,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/nw80x.c

@@ -2087,6 +2087,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/ov519.c

@@ -4981,6 +4981,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/ov534.c

@@ -1537,6 +1537,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend    = gspca_suspend,
 	.resume     = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/ov534_9.c

@@ -1493,6 +1493,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend    = gspca_suspend,
 	.resume     = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/pac207.c

@@ -462,6 +462,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/pac7302.c

@@ -925,6 +925,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/pac7311.c

@@ -694,6 +694,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/se401.c

@@ -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,

+ 1 - 0
drivers/media/video/gspca/sn9c2028.c

@@ -734,6 +734,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/sonixb.c

@@ -1486,6 +1486,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/sonixj.c

@@ -3199,6 +3199,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/spca1528.c

@@ -437,6 +437,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/spca500.c

@@ -983,6 +983,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/spca501.c

@@ -2047,6 +2047,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/spca505.c

@@ -800,6 +800,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/spca506.c

@@ -605,6 +605,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/spca508.c

@@ -1533,6 +1533,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/spca561.c

@@ -922,6 +922,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/sq905.c

@@ -433,6 +433,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume  = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/sq905c.c

@@ -340,6 +340,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume  = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/sq930x.c

@@ -1165,6 +1165,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend    = gspca_suspend,
 	.resume     = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/stk014.c

@@ -439,6 +439,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/stv0680.c

@@ -352,6 +352,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/sunplus.c

@@ -1078,6 +1078,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/t613.c

@@ -1043,6 +1043,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/tv8532.c

@@ -371,6 +371,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/vc032x.c

@@ -3846,6 +3846,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/vicam.c

@@ -358,6 +358,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume  = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };
 

+ 1 - 0
drivers/media/video/gspca/xirlink_cit.c

@@ -3135,6 +3135,7 @@ static struct usb_driver sd_driver = {
 #ifdef CONFIG_PM
 	.suspend = gspca_suspend,
 	.resume = gspca_resume,
+	.reset_resume = gspca_resume,
 #endif
 };