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

[karo-tx-linux.git] / drivers / input / keyboard / gpio_keys_polled.c

diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index 21147164874d8592227d92a96a5c97f59e217ca5..cd5ed9e221686625ba2ef92916c155c84732cb81 100644 (file)
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -324,7 +324,6 @@ err_free_gpio:
 
 err_free_bdev:
        kfree(bdev);
-       platform_set_drvdata(pdev, NULL);
 
 err_free_pdata:
        /* If we have no platform_data, we allocated pdata dynamically.  */
@@ -355,7 +354,6 @@ static int gpio_keys_polled_remove(struct platform_device *pdev)
                kfree(pdata);
 
        kfree(bdev);
-       platform_set_drvdata(pdev, NULL);
 
        return 0;
 }