aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-04 12:27:23 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-04 12:27:23 -0700
commitc929cd8f483b3d6debc083ae09aad2f26f4f77c6 (patch)
treec8c0a8bc1c2bd6fe1e554533c603179b9e235887
parent9d1ca649d928664fff454e439d07d6eb3633bb40 (diff)
downloadpatches-c929cd8f483b3d6debc083ae09aad2f26f4f77c6.tar.gz
idr serial patch update
-rw-r--r--usb-serial-idr.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/usb-serial-idr.patch b/usb-serial-idr.patch
index 91dbc029c50629..8ebe926ae4df81 100644
--- a/usb-serial-idr.patch
+++ b/usb-serial-idr.patch
@@ -141,7 +141,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+error:
+ /* unwind the already allocated minors */
+ for (j = 0; j < i; ++j)
-+ idr_remove(&serial_minors, serial->port[j]->port_number);
++ idr_remove(&serial_minors, serial->port[j]->minor);
+ return x;
}
@@ -151,7 +151,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
mutex_lock(&table_lock);
for (i = 0; i < serial->num_ports; ++i)
- serial_table[serial->minor + i] = NULL;
-+ idr_remove(&serial_minors, serial->port[i]->port_number);
++ idr_remove(&serial_minors, serial->port[i]->minor);
mutex_unlock(&table_lock);
}