Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[~andy/linux] / drivers / spi / spi-ppc4xx.c

diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c
index 19d615bd5d67903aec9f6efce527de6fbbd34560..5ee56726f8d080faaf052289a89c667fc425d85c 100644 (file)
--- a/drivers/spi/spi-ppc4xx.c
+++ b/drivers/spi/spi-ppc4xx.c
@@ -398,7 +398,7 @@ static int spi_ppc4xx_of_probe(struct platform_device *op)
        master->dev.of_node = np;
        platform_set_drvdata(op, master);
        hw = spi_master_get_devdata(master);
-       hw->master = spi_master_get(master);
+       hw->master = master;
        hw->dev = dev;
 
        init_completion(&hw->done);
@@ -560,6 +560,7 @@ static int spi_ppc4xx_of_remove(struct platform_device *op)
        free_irq(hw->irqnum, hw);
        iounmap(hw->regs);
        free_gpios(hw);
+       spi_master_put(master);
        return 0;
 }