summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2010-02-18 15:02:51 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 15:11:04 -0300
commite070bf9ef85e293d9dc586fbfabc008795564c0e (patch)
tree905fcfd9c4ac8724c9e0646cc5dbe0b6ae458cad /drivers
parent1e5eb1133aac7982dd941b473e23cd396acb2706 (diff)
V4L/DVB: gspca - main: Fix a compile error when CONFIG_INPUT is not set
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/gspca/gspca.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 1e24acd4d940..96a77697eb1e 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -40,8 +40,10 @@
#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;