diff options
| author | Dmitry Torokhov | 2006-08-08 20:48:06 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2006-09-26 16:53:33 +0200 |
| commit | 56b8df11345452103a75060a44429751ce71ee97 (patch) | |
| tree | 7ab323b3043c735365aad60557309cd094c19f7e /drivers | |
| parent | V4L/DVB (4410): Cleanups and fixes for dsbr100 (diff) | |
| download | kernel-qcow2-linux-56b8df11345452103a75060a44429751ce71ee97.tar.gz kernel-qcow2-linux-56b8df11345452103a75060a44429751ce71ee97.tar.xz kernel-qcow2-linux-56b8df11345452103a75060a44429751ce71ee97.zip | |
V4L/DVB (4413): Konicawc - handle errors from input_register_device()
Compile-tested only (no hardware)
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/usbvideo/konicawc.c | 9 |
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) |