From a8884dc0873c6138401c19742721ff01aa77c017 Mon Sep 17 00:00:00 2001
From: Adhir Ramjiawan <adhirramjiawan0@gmail.com>
Date: Mon, 9 Apr 2012 14:01:38 +0200
Subject: [PATCH] --- yaml --- r: 303556 b: refs/heads/master c:
 72b27a07efe8c7d63bc117d63e2b584a26d97e7c h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/usb/serial/ti_usb_3410_5052.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e6b0abaae25b..df6bd23ada1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c1301ddd1799fbdec2fc74bd7226cfd94edff78
+refs/heads/master: 72b27a07efe8c7d63bc117d63e2b584a26d97e7c
diff --git a/trunk/drivers/usb/serial/ti_usb_3410_5052.c b/trunk/drivers/usb/serial/ti_usb_3410_5052.c
index ab74123d658e..82116f42e6fd 100644
--- a/trunk/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/trunk/drivers/usb/serial/ti_usb_3410_5052.c
@@ -394,7 +394,9 @@ static int ti_startup(struct usb_serial *serial)
 
 	/* if we have only 1 configuration, download firmware */
 	if (dev->descriptor.bNumConfigurations == 1) {
-		if ((status = ti_download_firmware(tdev)) != 0)
+		status = ti_download_firmware(tdev);
+
+		if (status != 0)
 			goto free_tdev;
 
 		/* 3410 must be reset, 5052 resets itself */
@@ -1683,7 +1685,9 @@ static int ti_download_firmware(struct ti_device *tdev)
 	/* try ID specific firmware first, then try generic firmware */
 	sprintf(buf, "ti_usb-v%04x-p%04x.fw", dev->descriptor.idVendor,
 	    dev->descriptor.idProduct);
-	if ((status = request_firmware(&fw_p, buf, &dev->dev)) != 0) {
+	status = request_firmware(&fw_p, buf, &dev->dev);
+
+	if (status != 0) {
 		buf[0] = '\0';
 		if (dev->descriptor.idVendor == MTS_VENDOR_ID) {
 			switch (dev->descriptor.idProduct) {