]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
V4L/DVB: gspca - main: Fix a compile error when CONFIG_INPUT is not set
authorJean-François Moine <moinejf@free.fr>
Thu, 18 Feb 2010 18:02:51 +0000 (15:02 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 26 Feb 2010 18:11:04 +0000 (15:11 -0300)
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/gspca/gspca.c

index 1e24acd4d940a0c8c859ea1cea81edb0cff401de..96a77697eb1eb7187599f41f05f534c71d9c8a6e 100644 (file)
 
 #include "gspca.h"
 
+#ifdef CONFIG_INPUT
 #include <linux/input.h>
 #include <linux/usb/input.h>
+#endif
 
 /* global values */
 #define DEF_NURBS 3            /* default number of URBs */
@@ -2329,7 +2331,9 @@ EXPORT_SYMBOL(gspca_dev_probe);
 void gspca_disconnect(struct usb_interface *intf)
 {
        struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
+#ifdef CONFIG_INPUT
        struct input_dev *input_dev;
+#endif
 
        PDEBUG(D_PROBE, "%s disconnect",
                video_device_node_name(&gspca_dev->vdev));
@@ -2341,12 +2345,14 @@ void gspca_disconnect(struct usb_interface *intf)
                wake_up_interruptible(&gspca_dev->wq);
        }
 
+#ifdef CONFIG_INPUT
        gspca_input_destroy_urb(gspca_dev);
        input_dev = gspca_dev->input_dev;
        if (input_dev) {
                gspca_dev->input_dev = NULL;
                input_unregister_device(input_dev);
        }
+#endif
 
        /* the device is freed at exit of this function */
        gspca_dev->dev = NULL;