---

yaml --- r: 181761 b: refs/heads/master c: e763752 h: refs/heads/master i: 181759: f6c24e1 v: v3
git-mirror · Feb 26, 2010 · 7befcde · 7befcde
1 parent 25949f6
commit 7befcde
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;