Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / drivers / pcmcia / i82092.c

diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index 3578e1ca97a0027c70dc50d3b8c58613c334d122..519c4d6003a6924fc9f5f6e319d75947cfeff048 100644 (file)
--- a/drivers/pcmcia/i82092.c
+++ b/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 @@ err_out_disable:
 
 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");
 }