renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 17:53:56 +08:00
Code

V4L/DVB (4413): Konicawc - handle errors from input_register_device()

Browse Source 
Compile-tested only (no hardware)

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Dmitry Torokhov 2006-08-08 15:48:06 -03:00 committed by Mauro Carvalho Chehab
parent 5aff308c5e
commit 56b8df1134
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/video/usbvideo/konicawc.c
View File

@ -222,6 +222,7 @@ static void konicawc_adjust_picture(struct uvd *uvd)
static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev) static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev)
{ {
struct input_dev *input_dev; struct input_dev *input_dev;
int error;
usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname)); usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname));
strncat(cam->input_physname, "/input0", 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_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) static void konicawc_unregister_input(struct konicawc *cam)