From 245225e498132c52047ad032ca987b65c2c3f8d1 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 11 May 2011 21:28:16 +0800 Subject: [PATCH] --- yaml --- r: 251879 b: refs/heads/master c: 8901e1b98e1dad75c4567d03dd00a59bd6c450e8 h: refs/heads/master i: 251877: 97ad3e4dc8df2989072da315c63f728534a74279 251875: 67465d2e9c6817bb69a1ebd1368408c6fb133db6 251871: d85578facedf4dde877bb6149b99eb5b50d3a1e2 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi_tegra.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 23309a189357..282db0fe2bad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 680c1305e259a488f489bc887854523b6c6e0705 +refs/heads/master: 8901e1b98e1dad75c4567d03dd00a59bd6c450e8 diff --git a/trunk/drivers/spi/spi_tegra.c b/trunk/drivers/spi/spi_tegra.c index 891e5909038c..6c3aa6ecaade 100644 --- a/trunk/drivers/spi/spi_tegra.c +++ b/trunk/drivers/spi/spi_tegra.c @@ -578,6 +578,7 @@ static int __devexit spi_tegra_remove(struct platform_device *pdev) master = dev_get_drvdata(&pdev->dev); tspi = spi_master_get_devdata(master); + spi_unregister_master(master); tegra_dma_free_channel(tspi->rx_dma); dma_free_coherent(&pdev->dev, sizeof(u32) * BB_LEN, @@ -586,7 +587,6 @@ static int __devexit spi_tegra_remove(struct platform_device *pdev) clk_put(tspi->clk); iounmap(tspi->base); - spi_master_put(master); r = platform_get_resource(pdev, IORESOURCE_MEM, 0); release_mem_region(r->start, (r->end - r->start) + 1);