From ed0aae2c6dcfe8222b70c3eeba1acda355365435 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 18 Jul 2007 10:58:02 -0700
Subject: [PATCH] --- yaml --- r: 61955 b: refs/heads/master c:
 84346269f9a05e66ff2973916776a080d566f9ab h: refs/heads/master i:   61953:
 48290426a3322ec5165d21a9154ef33d233bab65   61951:
 b28b183d31ad35134993139f147a926cd3d775fb v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/misc/ftdi-elan.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d138cc1129f5..fc3ab48f71e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22bea334c941bcece2ddcc79201de4437803e3a5
+refs/heads/master: 84346269f9a05e66ff2973916776a080d566f9ab
diff --git a/trunk/drivers/usb/misc/ftdi-elan.c b/trunk/drivers/usb/misc/ftdi-elan.c
index 7cc6883a6fa3..538b535e955b 100644
--- a/trunk/drivers/usb/misc/ftdi-elan.c
+++ b/trunk/drivers/usb/misc/ftdi-elan.c
@@ -747,10 +747,12 @@ static ssize_t ftdi_elan_read(struct file *file, char __user *buffer,
 static void ftdi_elan_write_bulk_callback(struct urb *urb)
 {
         struct usb_ftdi *ftdi = (struct usb_ftdi *)urb->context;
-        if (urb->status && !(urb->status == -ENOENT || urb->status ==
-                -ECONNRESET || urb->status == -ESHUTDOWN)) {
+	int status = urb->status;
+
+	if (status && !(status == -ENOENT || status == -ECONNRESET ||
+	    status == -ESHUTDOWN)) {
                 dev_err(&ftdi->udev->dev, "urb=%p write bulk status received: %"
-                        "d\n", urb, urb->status);
+                        "d\n", urb, status);
         }
         usb_buffer_free(urb->dev, urb->transfer_buffer_length,
                 urb->transfer_buffer, urb->transfer_dma);