From 194776fdadfd671ede360e46803ae6fcda75cb79 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 2 Aug 2006 08:01:17 -0300 Subject: Konicawc - handle errors from input_register_device() From: Dmitry Torokhov Compile-tested only (no hardware) Signed-off-by: Dmitry Torokhov Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/usbvideo/konicawc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'linux') diff --git a/linux/drivers/media/video/usbvideo/konicawc.c b/linux/drivers/media/video/usbvideo/konicawc.c index 1feaf5f0b..1e8cf4485 100644 --- a/linux/drivers/media/video/usbvideo/konicawc.c +++ b/linux/drivers/media/video/usbvideo/konicawc.c @@ -228,6 +228,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)); @@ -248,7 +249,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); + cm->input = NULL; + } } static void konicawc_unregister_input(struct konicawc *cam) -- cgit v1.2.3