1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c
index 6f31ecc88843..4eee8be88314 100644
--- a/drivers/media/video/usbvideo/konicawc.c
+++ b/drivers/media/video/usbvideo/konicawc.c
@@ -222,6 +222,7 @@ static void konicawc_adjust_picture(struct uvd *uvd)
 static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev)
 {
         struct input_dev *input_dev;
+        int error;
 
         usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname));
         strncat(cam->input_physname, "/input0", sizeof(cam->input_physname));
@@ -242,7 +243,13 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev
 
         input_dev->private = cam;
 
-        input_register_device(cam->input);
+        error = input_register_device(cam->input);
+        if (error) {
+                warn("Failed to register camera's input device, err: %d\n",
+                     error);
+                input_free_device(cam->input);
+                cam->input = NULL;
+        }
 }
 
 static void konicawc_unregister_input(struct konicawc *cam)