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

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

USB: Staging: media: easycap: 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: Tomas Winkler <tomas.winkler@intel.com>
Cc: Jesper Juhl <jj@chaosbits.net>
Cc: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec42899c

drivers/staging/media/easycap/easycap_main.c

+4 −2
Original line number Diff line number Diff line
@@ -3578,7 +3578,8 @@ static int easycap_usb_probe(struct usb_interface *intf, 


		if (0 != (video_register_device(&(peasycap->video_device),

							VFL_TYPE_GRABBER, -1))) {

			err("Not able to register with videodev");

			dev_err(&intf->dev,

				"Not able to register with videodev\n");

			videodev_release(&(peasycap->video_device));

			return -ENODEV;

		}
@@ -3822,7 +3823,8 @@ static int easycap_usb_probe(struct usb_interface *intf, 


		rc = easycap_alsa_probe(peasycap);

		if (rc) {

			err("easycap_alsa_probe() rc = %i\n", rc);

			dev_err(&intf->dev, "easycap_alsa_probe() rc = %i\n",

				rc);

			return -ENODEV;

		}