aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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)
281} 281}
282#else 282#else
283#define gspca_input_connect(gspca_dev) 0 283#define gspca_input_connect(gspca_dev) 0
284#define gspca_input_create_urb(gspca_dev) 0 284#define gspca_input_create_urb(gspca_dev)
285#define gspca_input_destroy_urb(gspca_dev) 285#define gspca_input_destroy_urb(gspca_dev)
286#endif 286#endif
287 287
@@ -2315,8 +2315,10 @@ int gspca_dev_probe(struct usb_interface *intf,
2315 2315
2316 return 0; 2316 return 0;
2317out: 2317out:
2318#ifdef CONFIG_INPUT
2318 if (gspca_dev->input_dev) 2319 if (gspca_dev->input_dev)
2319 input_unregister_device(gspca_dev->input_dev); 2320 input_unregister_device(gspca_dev->input_dev);
2321#endif
2320 kfree(gspca_dev->usb_buf); 2322 kfree(gspca_dev->usb_buf);
2321 kfree(gspca_dev); 2323 kfree(gspca_dev);
2322 return ret; 2324 return ret;