diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-12-19 09:08:03 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-12-19 09:08:32 -0500 |
| commit | e23c34bb41da65f354fb7eee04300c56ee48f60c (patch) | |
| tree | 549fbe449d55273b81ef104a9755109bf4ae7817 /drivers/spi/spi-oc-tiny.c | |
| parent | b481c2cb3534c85dca625973b33eba15f9af3e4c (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply fixes on top of newer things
in tree (efi-stub).
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/spi/spi-oc-tiny.c')
| -rw-r--r-- | drivers/spi/spi-oc-tiny.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c index 333cb1badcd7..91c668596202 100644 --- 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) | |||
| 306 | platform_set_drvdata(pdev, hw); | 306 | platform_set_drvdata(pdev, hw); |
| 307 | 307 | ||
| 308 | /* setup the state for the bitbang driver */ | 308 | /* setup the state for the bitbang driver */ |
| 309 | hw->bitbang.master = spi_master_get(master); | 309 | hw->bitbang.master = master; |
| 310 | if (!hw->bitbang.master) | 310 | if (!hw->bitbang.master) |
| 311 | return err; | 311 | return err; |
| 312 | hw->bitbang.setup_transfer = tiny_spi_setup_transfer; | 312 | hw->bitbang.setup_transfer = tiny_spi_setup_transfer; |