From 5f48793b79028490d6741bf36f9500f33cc92417 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 25 Apr 2012 14:48:49 -0700 Subject: [PATCH] --- yaml --- r: 303626 b: refs/heads/master c: d372c4197d642763a6fde0ed3baa7cfce78df22d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/hdpvr/hdpvr-core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cc894200e573..c9c4d5d1972e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a581c72a8e9e9955714e8f3b62c46312bea3f6ba +refs/heads/master: d372c4197d642763a6fde0ed3baa7cfce78df22d diff --git a/trunk/drivers/media/video/hdpvr/hdpvr-core.c b/trunk/drivers/media/video/hdpvr/hdpvr-core.c index 6510110f53d0..304f43ef59eb 100644 --- a/trunk/drivers/media/video/hdpvr/hdpvr-core.c +++ b/trunk/drivers/media/video/hdpvr/hdpvr-core.c @@ -303,7 +303,7 @@ static int hdpvr_probe(struct usb_interface *interface, /* allocate memory for our device state and initialize it */ dev = kzalloc(sizeof(*dev), GFP_KERNEL); if (!dev) { - err("Out of memory"); + dev_err(&interface->dev, "Out of memory\n"); goto error; } @@ -311,7 +311,7 @@ static int hdpvr_probe(struct usb_interface *interface, /* register v4l2_device early so it can be used for printks */ if (v4l2_device_register(&interface->dev, &dev->v4l2_dev)) { - err("v4l2_device_register failed"); + dev_err(&interface->dev, "v4l2_device_register failed\n"); goto error; }