aboutsummaryrefslogtreecommitdiffstats
path: root/0028-ohci-dbg.c-move-assignment-out-of-if-block.patch
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-08-21 16:34:49 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-08-21 16:34:49 +0200
commit4758ee8bc89a86c2110b9e85878538ced8045ef5 (patch)
tree69539cae6631b1981fb23b51e01566f9e84f635d /0028-ohci-dbg.c-move-assignment-out-of-if-block.patch
parent02611ede94f297e19bea81ddf41425a24569a545 (diff)
downloadpatches-4758ee8bc89a86c2110b9e85878538ced8045ef5.tar.gz
add new patch and remove ones that were long ago merged
Diffstat (limited to '0028-ohci-dbg.c-move-assignment-out-of-if-block.patch')
-rw-r--r--0028-ohci-dbg.c-move-assignment-out-of-if-block.patch43
1 files changed, 0 insertions, 43 deletions
diff --git a/0028-ohci-dbg.c-move-assignment-out-of-if-block.patch b/0028-ohci-dbg.c-move-assignment-out-of-if-block.patch
deleted file mode 100644
index b7a1636476b27a..00000000000000
--- a/0028-ohci-dbg.c-move-assignment-out-of-if-block.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 12ed2c821d231d5e83e9fdccbacfed4b2604994e Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Wed, 29 Apr 2015 16:22:28 +0200
-Subject: [PATCH 28/36] USB: ohci-dbg.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: Alan Stern <stern@rowland.harvard.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/host/ohci-dbg.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
-index 04f2186939d2..c3eded317495 100644
---- a/drivers/usb/host/ohci-dbg.c
-+++ b/drivers/usb/host/ohci-dbg.c
-@@ -491,7 +491,8 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
- char *next;
- unsigned i;
-
-- if (!(seen = kmalloc (DBG_SCHED_LIMIT * sizeof *seen, GFP_ATOMIC)))
-+ seen = kmalloc(DBG_SCHED_LIMIT * sizeof *seen, GFP_ATOMIC);
-+ if (!seen)
- return 0;
- seen_count = 0;
-
-@@ -506,7 +507,8 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
- /* dump a snapshot of the periodic schedule (and load) */
- spin_lock_irqsave (&ohci->lock, flags);
- for (i = 0; i < NUM_INTS; i++) {
-- if (!(ed = ohci->periodic [i]))
-+ ed = ohci->periodic[i];
-+ if (!ed)
- continue;
-
- temp = scnprintf (next, size, "%2d [%3d]:", i, ohci->load [i]);
---
-2.3.7
-