diff options
| -rw-r--r-- | arch/arm/common/sa1111.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 6f80665f477e..9eaf65f43642 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c | |||
| @@ -1028,13 +1028,12 @@ static int sa1111_remove(struct platform_device *pdev) | |||
| 1028 | struct sa1111 *sachip = platform_get_drvdata(pdev); | 1028 | struct sa1111 *sachip = platform_get_drvdata(pdev); |
| 1029 | 1029 | ||
| 1030 | if (sachip) { | 1030 | if (sachip) { |
| 1031 | __sa1111_remove(sachip); | ||
| 1032 | platform_set_drvdata(pdev, NULL); | ||
| 1033 | |||
| 1034 | #ifdef CONFIG_PM | 1031 | #ifdef CONFIG_PM |
| 1035 | kfree(sachip->saved_state); | 1032 | kfree(sachip->saved_state); |
| 1036 | sachip->saved_state = NULL; | 1033 | sachip->saved_state = NULL; |
| 1037 | #endif | 1034 | #endif |
| 1035 | __sa1111_remove(sachip); | ||
| 1036 | platform_set_drvdata(pdev, NULL); | ||
| 1038 | } | 1037 | } |
| 1039 | 1038 | ||
| 1040 | return 0; | 1039 | return 0; |
