Merge tag 'xfs-for-linus-v3.13-rc1-2' of git://oss.sgi.com/xfs/xfs

[~andy/linux] / drivers / i2c / busses / scx200_acb.c

diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index 3862a953239c86c476961d101c43367f93ea4a0d..2d1d2c5653fb4d368f09f7f9dfeb724246dac0fc 100644 (file)
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -542,7 +542,6 @@ static int scx200_remove(struct platform_device *pdev)
        struct scx200_acb_iface *iface;
 
        iface = platform_get_drvdata(pdev);
-       platform_set_drvdata(pdev, NULL);
        scx200_cleanup_iface(iface);
 
        return 0;