[SCSI] sd: fix return value of sd_sync_cache()
[powerpc.git] / drivers / pcmcia / i82092.c
index d316d95..df21e2d 100644 (file)
@@ -161,7 +161,7 @@ static int __devinit i82092aa_pci_probe(struct pci_dev *dev, const struct pci_de
        pci_set_drvdata(dev, &sockets[i].socket);
 
        for (i = 0; i<socket_count; i++) {
-               sockets[i].socket.dev.dev = &dev->dev;
+               sockets[i].socket.dev.parent = &dev->dev;
                sockets[i].socket.ops = &i82092aa_operations;
                sockets[i].socket.resource_ops = &pccard_nonstatic_ops;
                ret = pcmcia_register_socket(&sockets[i].socket);
@@ -709,10 +709,7 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_
 
 static int i82092aa_module_init(void)
 {
-       enter("i82092aa_module_init");
-       pci_register_driver(&i82092aa_pci_drv);
-       leave("i82092aa_module_init");
-       return 0;
+       return pci_register_driver(&i82092aa_pci_drv);
 }
 
 static void i82092aa_module_exit(void)