From 7a33d2ec4507d5a17356b50777908dab98e5b661 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 14 Dec 2012 18:01:08 +0300
Subject: [PATCH] --- yaml --- r: 355007 b: refs/heads/master c:
 36c286d5a45731d957d02c317ee2ce775e856765 h: refs/heads/master i:   355005:
 43e23b19d7a4894d1a506a1f2189ecc7e65b810c   355003:
 ffd07291dbd0c9791f802a74fc0c3a877ef3f8f5   354999:
 4754606bccc9fe637894e42685f1185381219f8d   354991:
 eb23bc01db6c270fbe2d9cdadd84917c09b41a83   354975:
 7095a53d320f8b409bc8f6a844d97bebfe0f7ca3   354943:
 c6895ebc13914748f5340350994c4020ba3cc58b v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/pcmcia/i82092.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4d97280c8212..d73b4c597b67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7353f85ce82baa363b0338ef4cb3745eb0686760
+refs/heads/master: 36c286d5a45731d957d02c317ee2ce775e856765
diff --git a/trunk/drivers/pcmcia/i82092.c b/trunk/drivers/pcmcia/i82092.c
index 3578e1ca97a0..519c4d6003a6 100644
--- a/trunk/drivers/pcmcia/i82092.c
+++ b/trunk/drivers/pcmcia/i82092.c
@@ -133,8 +133,6 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *i
 		goto err_out_free_res;
 	}
 
-	pci_set_drvdata(dev, &sockets[i].socket);
-
 	for (i = 0; i<socket_count; i++) {
 		sockets[i].socket.dev.parent = &dev->dev;
 		sockets[i].socket.ops = &i82092aa_operations;
@@ -164,14 +162,14 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *i
 
 static void i82092aa_pci_remove(struct pci_dev *dev)
 {
-	struct pcmcia_socket *socket = pci_get_drvdata(dev);
+	int i;
 
 	enter("i82092aa_pci_remove");
 	
 	free_irq(dev->irq, i82092aa_interrupt);
 
-	if (socket)
-		pcmcia_unregister_socket(socket);
+	for (i = 0; i < socket_count; i++)
+		pcmcia_unregister_socket(&sockets[i].socket);
 
 	leave("i82092aa_pci_remove");
 }