diff --git a/[refs] b/[refs]
index 082a06d420d0..578e35d39bc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 217334d14d28e6a671e6dd2c7a35c9070b0721ea
+refs/heads/master: 1499ead31ede528a657c50761c4780c40f929d6d
diff --git a/trunk/drivers/misc/tifm_7xx1.c b/trunk/drivers/misc/tifm_7xx1.c
index 7fbf5d58bfc5..24b20a417a23 100644
--- a/trunk/drivers/misc/tifm_7xx1.c
+++ b/trunk/drivers/misc/tifm_7xx1.c
@@ -17,18 +17,12 @@
 
 static void tifm_7xx1_eject(struct tifm_adapter *fm, struct tifm_dev *sock)
 {
-	int cnt;
 	unsigned long flags;
 
 	spin_lock_irqsave(&fm->lock, flags);
 	if (!fm->inhibit_new_cards) {
-		for (cnt = 0; cnt < fm->max_sockets; cnt++) {
-			if (fm->sockets[cnt] == sock) {
-				fm->remove_mask |= (1 << cnt);
-				queue_work(fm->wq, &fm->media_remover);
-				break;
-			}
-		}
+		fm->remove_mask |= 1 << sock->socket_id;
+		queue_work(fm->wq, &fm->media_remover);
 	}
 	spin_unlock_irqrestore(&fm->lock, flags);
 }