Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[~andy/linux] / drivers / spi / spi-oc-tiny.c

diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c
index 333cb1badcd73be1da1656196139040cce133096..91c66859620232a024827df02f846c0a6f08798d 100644 (file)
--- a/drivers/spi/spi-oc-tiny.c
+++ b/drivers/spi/spi-oc-tiny.c
@@ -306,7 +306,7 @@ static int tiny_spi_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, hw);
 
        /* setup the state for the bitbang driver */
-       hw->bitbang.master = spi_master_get(master);
+       hw->bitbang.master = master;
        if (!hw->bitbang.master)
                return err;
        hw->bitbang.setup_transfer = tiny_spi_setup_transfer;