diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-21 16:34:49 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-21 16:34:49 +0200 |
| commit | 4758ee8bc89a86c2110b9e85878538ced8045ef5 (patch) | |
| tree | 69539cae6631b1981fb23b51e01566f9e84f635d /0013-synclinkmp.c-move-assignment-out-of-if-block.patch | |
| parent | 02611ede94f297e19bea81ddf41425a24569a545 (diff) | |
| download | patches-4758ee8bc89a86c2110b9e85878538ced8045ef5.tar.gz | |
add new patch and remove ones that were long ago merged
Diffstat (limited to '0013-synclinkmp.c-move-assignment-out-of-if-block.patch')
| -rw-r--r-- | 0013-synclinkmp.c-move-assignment-out-of-if-block.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/0013-synclinkmp.c-move-assignment-out-of-if-block.patch b/0013-synclinkmp.c-move-assignment-out-of-if-block.patch deleted file mode 100644 index ad14e2d91bbae6..00000000000000 --- a/0013-synclinkmp.c-move-assignment-out-of-if-block.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 81823a3d3e8062b6556db720bac0d3ab15b5b81e Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Wed, 29 Apr 2015 16:22:08 +0200 -Subject: [PATCH 13/36] tty: synclinkmp.c: move assignment out of if () block - -We should not be doing assignments within an if () block -so fix up the code to not do this. - -change was created using Coccinelle. - -CC: Jiri Slaby <jslaby@suse.cz> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/tty/synclinkmp.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c -index c3f90910fed9..08633a8139ff 100644 ---- a/drivers/tty/synclinkmp.c -+++ b/drivers/tty/synclinkmp.c -@@ -1655,7 +1655,8 @@ static int hdlcdev_open(struct net_device *dev) - printk("%s:hdlcdev_open(%s)\n",__FILE__,dev->name); - - /* generic HDLC layer open processing */ -- if ((rc = hdlc_open(dev))) -+ rc = hdlc_open(dev); -+ if (rc) - return rc; - - /* arbitrate between network and tty opens */ -@@ -1922,7 +1923,8 @@ static int hdlcdev_init(SLMP_INFO *info) - - /* allocate and initialize network and HDLC layer objects */ - -- if (!(dev = alloc_hdlcdev(info))) { -+ dev = alloc_hdlcdev(info); -+ if (!dev) { - printk(KERN_ERR "%s:hdlc device allocation failure\n",__FILE__); - return -ENOMEM; - } -@@ -1943,7 +1945,8 @@ static int hdlcdev_init(SLMP_INFO *info) - hdlc->xmit = hdlcdev_xmit; - - /* register objects with HDLC layer */ -- if ((rc = register_hdlc_device(dev))) { -+ rc = register_hdlc_device(dev); -+ if (rc) { - printk(KERN_WARNING "%s:unable to register hdlc device\n",__FILE__); - free_netdev(dev); - return rc; -@@ -3920,7 +3923,8 @@ static void synclinkmp_cleanup(void) - printk("Unloading %s %s\n", driver_name, driver_version); - - if (serial_driver) { -- if ((rc = tty_unregister_driver(serial_driver))) -+ rc = tty_unregister_driver(serial_driver); -+ if (rc) - printk("%s(%d) failed to unregister tty driver err=%d\n", - __FILE__,__LINE__,rc); - put_tty_driver(serial_driver); --- -2.3.7 - |