From: Joe Perches <joe@perches.com>
Date: Fri, 4 Apr 2014 22:16:03 +0000 (-0700)
Subject: usb: ftdi-elan: Fix format fragments
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=90ba4f79198e2da11e94d66f6c67cf7cbaf868ac;p=deliverable%2Flinux.git

usb: ftdi-elan: Fix format fragments

Breaking formats into fragments with a split
between % and field types should be coalesced.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index a4a3c7cd4a11..314e5974c723 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -729,8 +729,8 @@ static void ftdi_elan_write_bulk_callback(struct urb *urb)
 
 	if (status && !(status == -ENOENT || status == -ECONNRESET ||
 	    status == -ESHUTDOWN)) {
-                dev_err(&ftdi->udev->dev, "urb=%p write bulk status received: %"
-                        "d\n", urb, status);
+		dev_err(&ftdi->udev->dev,
+			"urb=%p write bulk status received: %d\n", urb, status);
         }
         usb_free_coherent(urb->dev, urb->transfer_buffer_length,
                 urb->transfer_buffer, urb->transfer_dma);
@@ -1181,8 +1181,8 @@ static ssize_t ftdi_elan_write(struct file *file,
         urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
         retval = usb_submit_urb(urb, GFP_KERNEL);
         if (retval) {
-                dev_err(&ftdi->udev->dev, "failed submitting write urb, error %"
-                        "d\n", retval);
+		dev_err(&ftdi->udev->dev,
+			"failed submitting write urb, error %d\n", retval);
                 goto error_3;
         }
         usb_free_urb(urb);