aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-imx.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-26 11:20:58 -0400
committerMark Brown <broonie@linaro.org>2013-06-26 11:20:58 -0400
commit6140b05ca351000dd844f05495198d8425ccf394 (patch)
tree1024c1b1e07a206b509dab0aad0c8399a2a97635 /drivers/spi/spi-imx.c
parent2924f096a816367c80cefc05036d8e9f5bd68f6c (diff)
parent89e8773075bae055090db518bf2085c0d40ca9d5 (diff)
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi/spi-imx.c')
-rw-r--r--drivers/spi/spi-imx.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 982667383dd5..b805cd0e00b5 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -902,7 +902,6 @@ out_gpio_free:
902 } 902 }
903 spi_master_put(master); 903 spi_master_put(master);
904 kfree(master); 904 kfree(master);
905 platform_set_drvdata(pdev, NULL);
906 return ret; 905 return ret;
907} 906}
908 907
@@ -929,8 +928,6 @@ static int spi_imx_remove(struct platform_device *pdev)
929 928
930 release_mem_region(res->start, resource_size(res)); 929 release_mem_region(res->start, resource_size(res));
931 930
932 platform_set_drvdata(pdev, NULL);
933
934 return 0; 931 return 0;
935} 932}
936 933