From 1a37c1c6837b5a8502bc5cea10fd5756b562633e Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Fri, 16 Nov 2012 23:35:16 -0800
Subject: [PATCH] --- yaml --- r: 342589 b: refs/heads/master c:
 190006f9d6594ee9ef4775ec09edda7df76fc8f1 h: refs/heads/master i:   342587:
 3c74561d831b7d89a3bab0f887f50e767021b549 v: v3

---
 [refs]                     | 2 +-
 trunk/sound/usb/endpoint.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 56ee450ae0f3..a26f62bd1006 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 701ef3205eb33bce4ba97b96f6f04a5ae29cd7b8
+refs/heads/master: 190006f9d6594ee9ef4775ec09edda7df76fc8f1
diff --git a/trunk/sound/usb/endpoint.c b/trunk/sound/usb/endpoint.c
index 34de6f2faf61..51a9aa372cc7 100644
--- a/trunk/sound/usb/endpoint.c
+++ b/trunk/sound/usb/endpoint.c
@@ -485,15 +485,10 @@ struct snd_usb_endpoint *snd_usb_add_endpoint(struct snd_usb_audio *chip,
 static int wait_clear_urbs(struct snd_usb_endpoint *ep)
 {
 	unsigned long end_time = jiffies + msecs_to_jiffies(1000);
-	unsigned int i;
 	int alive;
 
 	do {
-		alive = 0;
-		for (i = 0; i < ep->nurbs; i++)
-			if (test_bit(i, &ep->active_mask))
-				alive++;
-
+		alive = bitmap_weight(&ep->active_mask, ep->nurbs);
 		if (!alive)
 			break;