From 2ef3cdb132b4a35b7a038aaf74cac102f62d94d4 Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@gmail.com>
Date: Tue, 22 Mar 2011 11:12:21 +0100
Subject: [PATCH] --- yaml --- r: 248703 b: refs/heads/master c:
 dab54c9f1e26f47a3313300bc1f4dc0eecb47375 h: refs/heads/master i:   248701:
 7bae34e1f4679282388aa2f923817c540e8bd8a6   248699:
 84280c3fc1ffe7a79fd13660720ac85ffb3dcaf3   248695:
 c6fd3d15af8b2dc56ba082a5a877ba91ca3b0774   248687:
 5c9334c3bd43045fbbd2441f2080b07881946bed   248671:
 bf75804837ce64a3367e2d50f656630b079e435e   248639:
 97c2811b9e168489e30f2d2f21abe9ff8cf7fb95   248575:
 691766d7fdbb2c79602aaa54b9fb5f7e7269bdd9 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/usb/class/cdc-acm.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e67adb00f68a..b11acc3753b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fb6b8846458afb7b5689f86cf35705c40eb70e5
+refs/heads/master: dab54c9f1e26f47a3313300bc1f4dc0eecb47375
diff --git a/trunk/drivers/usb/class/cdc-acm.c b/trunk/drivers/usb/class/cdc-acm.c
index e0f9febee7e6..2d8d6b838235 100644
--- a/trunk/drivers/usb/class/cdc-acm.c
+++ b/trunk/drivers/usb/class/cdc-acm.c
@@ -606,16 +606,15 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)
 
 static void acm_tty_unregister(struct acm *acm)
 {
-	int i, nr;
+	int i;
 
-	nr = acm->rx_buflimit;
 	tty_unregister_device(acm_tty_driver, acm->minor);
 	usb_put_intf(acm->control);
 	acm_table[acm->minor] = NULL;
 	usb_free_urb(acm->ctrlurb);
 	for (i = 0; i < ACM_NW; i++)
 		usb_free_urb(acm->wb[i].urb);
-	for (i = 0; i < nr; i++)
+	for (i = 0; i < acm->rx_buflimit; i++)
 		usb_free_urb(acm->ru[i].urb);
 	kfree(acm->country_codes);
 	kfree(acm);
@@ -623,7 +622,8 @@ static void acm_tty_unregister(struct acm *acm)
 
 static void acm_port_down(struct acm *acm)
 {
-	int i, nr = acm->rx_buflimit;
+	int i;
+
 	mutex_lock(&open_mutex);
 	if (acm->dev) {
 		usb_autopm_get_interface(acm->control);
@@ -632,7 +632,7 @@ static void acm_port_down(struct acm *acm)
 		for (i = 0; i < ACM_NW; i++)
 			usb_kill_urb(acm->wb[i].urb);
 		tasklet_disable(&acm->urb_task);
-		for (i = 0; i < nr; i++)
+		for (i = 0; i < acm->rx_buflimit; i++)
 			usb_kill_urb(acm->ru[i].urb);
 		tasklet_enable(&acm->urb_task);
 		acm->control->needs_remote_wakeup = 0;
@@ -882,9 +882,9 @@ static void acm_write_buffers_free(struct acm *acm)
 static void acm_read_buffers_free(struct acm *acm)
 {
 	struct usb_device *usb_dev = interface_to_usbdev(acm->control);
-	int i, n = acm->rx_buflimit;
+	int i;
 
-	for (i = 0; i < n; i++)
+	for (i = 0; i < acm->rx_buflimit; i++)
 		usb_free_coherent(usb_dev, acm->readsize,
 				  acm->rb[i].base, acm->rb[i].dma);
 }