Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d372c419 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a581c72a

drivers/media/video/hdpvr/hdpvr-core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}