aboutsummaryrefslogtreecommitdiffstats
path: root/0002-amiserial.c-move-assignment-out-of-if-block.patch
diff options
Diffstat (limited to '0002-amiserial.c-move-assignment-out-of-if-block.patch')
-rw-r--r--0002-amiserial.c-move-assignment-out-of-if-block.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/0002-amiserial.c-move-assignment-out-of-if-block.patch b/0002-amiserial.c-move-assignment-out-of-if-block.patch
new file mode 100644
index 00000000000000..89bdd2e88e0f0f
--- /dev/null
+++ b/0002-amiserial.c-move-assignment-out-of-if-block.patch
@@ -0,0 +1,28 @@
+From 7d99b4864316e37368a83069907302cabc1a9f62 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Wed, 29 Apr 2015 16:22:00 +0200
+Subject: [PATCH 02/36] amiserial.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/amiserial.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/tty/amiserial.c
++++ b/drivers/tty/amiserial.c
+@@ -1786,7 +1786,8 @@ static int __exit amiga_serial_remove(st
+ struct serial_state *state = platform_get_drvdata(pdev);
+
+ /* printk("Unloading %s: version %s\n", serial_name, serial_version); */
+- if ((error = tty_unregister_driver(serial_driver)))
++ error = tty_unregister_driver(serial_driver);
++ if (error)
+ printk("SERIAL: failed to unregister serial driver (%d)\n",
+ error);
+ put_tty_driver(serial_driver);