arm: dts: tx6: add some aliases and a label for backlight@0

[karo-tx-linux.git] / drivers / spi / spi-au1550.c

diff --git a/drivers/spi/spi-au1550.c b/drivers/spi/spi-au1550.c
index 1d00d9b397dde39dc585c2c99d7be47cbb50607e..c4141c92bcff5734c4f228e94c5ce38a665c0d94 100644 (file)
--- a/drivers/spi/spi-au1550.c
+++ b/drivers/spi/spi-au1550.c
@@ -775,7 +775,7 @@ static int au1550_spi_probe(struct platform_device *pdev)
 
        hw = spi_master_get_devdata(master);
 
-       hw->master = spi_master_get(master);
+       hw->master = master;
        hw->pdata = dev_get_platdata(&pdev->dev);
        hw->dev = &pdev->dev;
 
@@ -985,6 +985,7 @@ static int au1550_spi_remove(struct platform_device *pdev)
 MODULE_ALIAS("platform:au1550-spi");
 
 static struct platform_driver au1550_spi_drv = {
+       .probe = au1550_spi_probe,
        .remove = au1550_spi_remove,
        .driver = {
                .name = "au1550-spi",
@@ -1004,7 +1005,7 @@ static int __init au1550_spi_init(void)
                        printk(KERN_ERR "au1550-spi: cannot add memory"
                                        "dbdma device\n");
        }
-       return platform_driver_probe(&au1550_spi_drv, au1550_spi_probe);
+       return platform_driver_register(&au1550_spi_drv);
 }
 module_init(au1550_spi_init);