Merge remote-tracking branch 'spi/topic/txx9' into spi-next

git-mirror · Jun 26, 2013 · 592cd34 · 592cd34
2 parents cf7315b + 69a0171
commit 592cd34
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c
@@ -419,7 +419,6 @@ static int txx9spi_probe(struct platform_device *dev)
 		clk_disable(c->clk);
 		clk_put(c->clk);
 	}
-	platform_set_drvdata(dev, NULL);
 	spi_master_put(master);
 	return ret;
 }
@@ -430,7 +429,6 @@ static int txx9spi_remove(struct platform_device *dev)
 	struct txx9spi *c = spi_master_get_devdata(master);
 
 	spi_unregister_master(master);
-	platform_set_drvdata(dev, NULL);
 	destroy_workqueue(c->workqueue);
 	clk_disable(c->clk);
 	clk_put(c->clk);