summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorAdhir Ramjiawan <adhirramjiawan0@gmail.com>2012-04-09 14:01:38 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-18 13:58:57 -0700
commit72b27a07efe8c7d63bc117d63e2b584a26d97e7c (patch)
tree61aef506539815179c7fe4e5d9afc828ae5ee97c /drivers/usb/serial
parent1c1301ddd1799fbdec2fc74bd7226cfd94edff78 (diff)
downloadblackbird-op-linux-72b27a07efe8c7d63bc117d63e2b584a26d97e7c.tar.gz
blackbird-op-linux-72b27a07efe8c7d63bc117d63e2b584a26d97e7c.zip
USB: serial: removed assignment from if statements in ti_usb_3410_5052.c
Removed the assignment statements found in if statements by the checkpatch.pl tool. Signed-off-by: Adhir Ramjiawan <adhirramjiawan0@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/ti_usb_3410_5052.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index ab74123d658e..82116f42e6fd 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/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) {
OpenPOWER on IntegriCloud