The patch number 14386 was added via Douglas Schilling Landgraf
<[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Hans de Goede <[email protected]>
gspca_main: Fix a compile error when CONFIG_INPUT is not set
gspca_main: Fix a compile error when CONFIG_INPUT is not set.
Priority: normal
Signed-off-by: Hans de Goede <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Douglas Schilling Landgraf <[email protected]>
---
linux/drivers/media/video/gspca/gspca.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff -r b2c1397f1fb0 -r 4fbc7a267e55 linux/drivers/media/video/gspca/gspca.c
--- a/linux/drivers/media/video/gspca/gspca.c Thu Mar 04 02:36:22 2010 -0300
+++ b/linux/drivers/media/video/gspca/gspca.c Thu Mar 04 02:41:56 2010 -0300
@@ -300,7 +300,7 @@
}
#else
#define gspca_input_connect(gspca_dev) 0
-#define gspca_input_create_urb(gspca_dev) 0
+#define gspca_input_create_urb(gspca_dev)
#define gspca_input_destroy_urb(gspca_dev)
#endif
#endif
@@ -2357,10 +2357,12 @@
return 0;
out:
+#ifdef CONFIG_INPUT
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
if (gspca_dev->input_dev)
input_unregister_device(gspca_dev->input_dev);
#endif
+#endif
kfree(gspca_dev->usb_buf);
kfree(gspca_dev);
return ret;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/4fbc7a267e55eb989c55124e9bd8d3cc8ec11354
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
