summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/usbvideo/konicawc.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-10-30 06:08:21 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-30 06:08:21 -0200
commit99dba13c2a2034363c788d26173340fb15c0c35c (patch)
tree3103fcabab3e7d3032a7da4b683bb6a859aad910 /linux/drivers/media/video/usbvideo/konicawc.c
parentb1a4f9b5853cc26829270834d194ee8358cb6e53 (diff)
parent72dcd14ea4cdcd3556de0fe17a85120578777e53 (diff)
downloadmediapointer-dvb-s2-99dba13c2a2034363c788d26173340fb15c0c35c.tar.gz
mediapointer-dvb-s2-99dba13c2a2034363c788d26173340fb15c0c35c.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/usbvideo/konicawc.c')
-rw-r--r--linux/drivers/media/video/usbvideo/konicawc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/linux/drivers/media/video/usbvideo/konicawc.c b/linux/drivers/media/video/usbvideo/konicawc.c
index 5c11ea64c..73abbb3f4 100644
--- a/linux/drivers/media/video/usbvideo/konicawc.c
+++ b/linux/drivers/media/video/usbvideo/konicawc.c
@@ -234,7 +234,8 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev
cam->input = input_dev = input_allocate_device();
if (!input_dev) {
- warn("Not enough memory for camera's input device\n");
+ dev_warn(&dev->dev,
+ "Not enough memory for camera's input device\n");
return;
}
@@ -252,8 +253,9 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev
error = input_register_device(cam->input);
if (error) {
- warn("Failed to register camera's input device, err: %d\n",
- error);
+ dev_warn(&dev->dev,
+ "Failed to register camera's input device, err: %d\n",
+ error);
input_free_device(cam->input);
cam->input = NULL;
}