evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "staging:media:lirc: quoted string split across lines"

Browse source 
This reverts commit 7db78438d9.

It broke the build, and isn't ok.

Cc: Archana kumari <archanakumari959@gmail.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-10-15 09:40:57 -07:00
parent e7ed40fb26
commit dc070641ee
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/staging/media/lirc/lirc_imon.c
View file

@ -619,9 +619,8 @@ static void imon_incoming_packet(struct imon_context *context,
return; return;
if (len != 8) { if (len != 8) {
dev_warn(dev, dev_warn(dev, "imon %s: invalid incoming packet "
"imon %s: invalid incoming packet size (len = %d, intf%d)\n", "size (len = %d, intf%d)\n", __func__, len, intf);
__func__, len, intf);
return; return;
} }
@ -879,8 +878,8 @@ static int imon_probe(struct usb_interface *interface,
alloc_status = 7; alloc_status = 7;
goto unlock; goto unlock;
} else } else
dev_info(dev, "Registered iMON driver (lirc minor: %d)\n", dev_info(dev, "Registered iMON driver "
lirc_minor); "(lirc minor: %d)\n", lirc_minor);
/* Needed while unregistering! */ /* Needed while unregistering! */
driver->minor = lirc_minor; driver->minor = lirc_minor;
@ -924,16 +923,14 @@ static int imon_probe(struct usb_interface *interface,
if (usb_register_dev(interface, &imon_class)) { if (usb_register_dev(interface, &imon_class)) {
/* Not a fatal error, so ignore */ /* Not a fatal error, so ignore */
dev_info(dev, dev_info(dev, "%s: could not get a minor number for "
"%s: could not get a minor number for display\n" "display\n", __func__);
__func__);
} }
} }
dev_info(dev, dev_info(dev, "iMON device (%04x:%04x, intf%d) on "
"iMON device (%04x:%04x, intf%d) on usb<%d:%d> initialized\n", "usb<%d:%d> initialized\n", vendor, product, ifnum,
vendor, product, ifnum, usbdev->bus->busnum, usbdev->bus->busnum, usbdev->devnum);
usbdev->devnum);
unlock: unlock:
mutex_unlock(&context->ctx_lock); mutex_unlock(&context->ctx_lock);