Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / mfd / ab8500-spi.c

diff --git a/drivers/mfd/ab8500-spi.c b/drivers/mfd/ab8500-spi.c
index e1c8b62b086d506ef46d8a52ccb6d5c4d73e0a18..b1653421edb5480005f03dc6d4e3afa8b337b963 100644 (file)
--- a/drivers/mfd/ab8500-spi.c
+++ b/drivers/mfd/ab8500-spi.c
@@ -83,6 +83,11 @@ static int __devinit ab8500_spi_probe(struct spi_device *spi)
        struct ab8500 *ab8500;
        int ret;
 
+       spi->bits_per_word = 24;
+       ret = spi_setup(spi);
+       if (ret < 0)
+               return ret;
+
        ab8500 = kzalloc(sizeof *ab8500, GFP_KERNEL);
        if (!ab8500)
                return -ENOMEM;
@@ -114,7 +119,7 @@ static int __devexit ab8500_spi_remove(struct spi_device *spi)
 
 static struct spi_driver ab8500_spi_driver = {
        .driver = {
-               .name = "ab8500",
+               .name = "ab8500-spi",
                .owner = THIS_MODULE,
        },
        .probe  = ab8500_spi_probe,