diff --git a/[refs] b/[refs]
index 0a65e987b79c..5a40b0c38700 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10ee2402004d03b31555aad7badf7e499fa686d3
+refs/heads/master: e7637521ac92ce99045b8f8a9c1419bb7814ff9a
diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
index a156dd42bc40..222af479150b 100644
--- a/trunk/drivers/media/video/gspca/gspca.c
+++ b/trunk/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;