Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi

[~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 e60a776ed2d498f7f4574172b7638e37c0d75ef0..58deb79d046be444cbb0392e4f17583e8d99ee8d 100644 (file)
--- a/drivers/spi/spi-oc-tiny.c
+++ b/drivers/spi/spi-oc-tiny.c
@@ -368,7 +368,6 @@ exit_gpio:
 exit_busy:
        err = -EBUSY;
 exit:
-       platform_set_drvdata(pdev, NULL);
        spi_master_put(master);
        return err;
 }
@@ -382,7 +381,6 @@ static int tiny_spi_remove(struct platform_device *pdev)
        spi_bitbang_stop(&hw->bitbang);
        for (i = 0; i < hw->gpio_cs_count; i++)
                gpio_free(hw->gpio_cs[i]);
-       platform_set_drvdata(pdev, NULL);
        spi_master_put(master);
        return 0;
 }