From 3e319371c004146011c01a908dd8dc807e421393 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Fri, 24 Aug 2012 11:03:02 -0700 Subject: [PATCH] --- yaml --- r: 328626 b: refs/heads/master c: 7d520d28dd5287d14b5ec6cf4405a1220ca57d42 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-mxs.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index bace485d702a..2f237ce25e2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41682e03d4fdc947dbd22725d70f222cc7746852 +refs/heads/master: 7d520d28dd5287d14b5ec6cf4405a1220ca57d42 diff --git a/trunk/drivers/spi/spi-mxs.c b/trunk/drivers/spi/spi-mxs.c index 4e7801dd571a..10d34ebe9ca3 100644 --- a/trunk/drivers/spi/spi-mxs.c +++ b/trunk/drivers/spi/spi-mxs.c @@ -586,7 +586,6 @@ static int __devinit mxs_spi_probe(struct platform_device *pdev) return 0; out_free_dma: - platform_set_drvdata(pdev, NULL); dma_release_channel(ssp->dmach); clk_disable_unprepare(ssp->clk); out_master_free: @@ -600,14 +599,12 @@ static int __devexit mxs_spi_remove(struct platform_device *pdev) struct mxs_spi *spi; struct mxs_ssp *ssp; - master = platform_get_drvdata(pdev); + master = spi_master_get(platform_get_drvdata(pdev)); spi = spi_master_get_devdata(master); ssp = &spi->ssp; spi_unregister_master(master); - platform_set_drvdata(pdev, NULL); - dma_release_channel(ssp->dmach); clk_disable_unprepare(ssp->clk);