diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 14:48:49 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 14:48:49 -0700 |
| commit | d372c4197d642763a6fde0ed3baa7cfce78df22d (patch) | |
| tree | 722af0fe534044e12d016d0dc4b76329af813a90 | |
| parent | a581c72a8e9e9955714e8f3b62c46312bea3f6ba (diff) | |
| download | linux-d372c4197d642763a6fde0ed3baa7cfce78df22d.tar.gz | |
USB: hdpvr-core.c: remove err() usage
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: Mauro Carvalho Chehab <mchehab@infradead.org> CC: Jarod Wilson <jarod@redhat.com> CC: Taylor Ralph <tralph@mythtv.org> CC: Andrew Morton <akpm@linux-foundation.org> CC: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/media/video/hdpvr/hdpvr-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c index 6510110f53d0..304f43ef59eb 100644 --- a/drivers/media/video/hdpvr/hdpvr-core.c +++ b/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; } |