From 1665f83891a458354384353a87eb24458c7b2a5d Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Tue, 8 Aug 2006 15:48:06 -0300 Subject: [PATCH] --- yaml --- r: 37360 b: refs/heads/master c: 56b8df11345452103a75060a44429751ce71ee97 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/usbvideo/konicawc.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7ab7bec90ec1..cc05312790af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5aff308c5e73307fc495b89b6421b491f56d3657 +refs/heads/master: 56b8df11345452103a75060a44429751ce71ee97 diff --git a/trunk/drivers/media/video/usbvideo/konicawc.c b/trunk/drivers/media/video/usbvideo/konicawc.c index 6f31ecc88843..4eee8be88314 100644 --- a/trunk/drivers/media/video/usbvideo/konicawc.c +++ b/trunk/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)