diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-29 16:24:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-29 16:24:28 +0200 |
| commit | 24b1c251dfcd02877c40d7e52288c9bc2dc7ff35 (patch) | |
| tree | 8fb3d4332168686f601f58b23815910799b1699f /0035-mon_main.c-move-assignment-out-of-if-block.patch | |
| parent | 71c7e32cd1509d46be836ed19dfe63e217eae8d4 (diff) | |
| download | patches-24b1c251dfcd02877c40d7e52288c9bc2dc7ff35.tar.gz | |
updates and new patches
Diffstat (limited to '0035-mon_main.c-move-assignment-out-of-if-block.patch')
| -rw-r--r-- | 0035-mon_main.c-move-assignment-out-of-if-block.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/0035-mon_main.c-move-assignment-out-of-if-block.patch b/0035-mon_main.c-move-assignment-out-of-if-block.patch new file mode 100644 index 00000000000000..72f9f96318193f --- /dev/null +++ b/0035-mon_main.c-move-assignment-out-of-if-block.patch @@ -0,0 +1,62 @@ +From ed1aa46db7d2fa1b00838fac9ba71e85d22b0931 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Wed, 29 Apr 2015 16:22:36 +0200 +Subject: [PATCH 35/36] mon_main.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. + +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/mon/mon_main.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c +index 10405119985c..f7c292f4891e 100644 +--- a/drivers/usb/mon/mon_main.c ++++ b/drivers/usb/mon/mon_main.c +@@ -96,7 +96,8 @@ static void mon_submit(struct usb_bus *ubus, struct urb *urb) + { + struct mon_bus *mbus; + +- if ((mbus = ubus->mon_bus) != NULL) ++ mbus = ubus->mon_bus; ++ if (mbus != NULL) + mon_bus_submit(mbus, urb); + mon_bus_submit(&mon_bus0, urb); + } +@@ -122,7 +123,8 @@ static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int error) + { + struct mon_bus *mbus; + +- if ((mbus = ubus->mon_bus) != NULL) ++ mbus = ubus->mon_bus; ++ if (mbus != NULL) + mon_bus_submit_error(mbus, urb, error); + mon_bus_submit_error(&mon_bus0, urb, error); + } +@@ -148,7 +150,8 @@ static void mon_complete(struct usb_bus *ubus, struct urb *urb, int status) + { + struct mon_bus *mbus; + +- if ((mbus = ubus->mon_bus) != NULL) ++ mbus = ubus->mon_bus; ++ if (mbus != NULL) + mon_bus_complete(mbus, urb, status); + mon_bus_complete(&mon_bus0, urb, status); + } +@@ -280,7 +283,8 @@ static void mon_bus_init(struct usb_bus *ubus) + { + struct mon_bus *mbus; + +- if ((mbus = kzalloc(sizeof(struct mon_bus), GFP_KERNEL)) == NULL) ++ mbus = kzalloc(sizeof(struct mon_bus), GFP_KERNEL); ++ if (mbus == NULL) + goto err_alloc; + kref_init(&mbus->ref); + spin_lock_init(&mbus->lock); +-- +2.3.7 + |