summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2010-02-19 05:11:09 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 15:11:10 -0300
commite7637521ac92ce99045b8f8a9c1419bb7814ff9a (patch)
tree3877efdc33dfc3fa583c46ed82de71ca0c0eccaa /drivers/media/video
parent10ee2402004d03b31555aad7badf7e499fa686d3 (diff)
downloadblackbird-op-linux-e7637521ac92ce99045b8f8a9c1419bb7814ff9a.tar.gz
blackbird-op-linux-e7637521ac92ce99045b8f8a9c1419bb7814ff9a.zip
V4L/DVB: gspca_main: Fix a compile error when CONFIG_INPUT is not set
gspca_main: Fix a compile error when CONFIG_INPUT is not set. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/gspca/gspca.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index a156dd42bc40..222af479150b 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -281,7 +281,7 @@ static void gspca_input_destroy_urb(struct gspca_dev *gspca_dev)
}
#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
@@ -2315,8 +2315,10 @@ int gspca_dev_probe(struct usb_interface *intf,
return 0;
out:
+#ifdef CONFIG_INPUT
if (gspca_dev->input_dev)
input_unregister_device(gspca_dev->input_dev);
+#endif
kfree(gspca_dev->usb_buf);
kfree(gspca_dev);
return ret;
OpenPOWER on IntegriCloud