diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /drivers/mailbox/mailbox-omap2.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'drivers/mailbox/mailbox-omap2.c')
| -rw-r--r-- | drivers/mailbox/mailbox-omap2.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mailbox/mailbox-omap2.c b/drivers/mailbox/mailbox-omap2.c index eba380d7b17f..42d2b893ea67 100644 --- a/drivers/mailbox/mailbox-omap2.c +++ b/drivers/mailbox/mailbox-omap2.c | |||
| @@ -325,7 +325,6 @@ static int omap2_mbox_remove(struct platform_device *pdev) | |||
| 325 | kfree(privblk); | 325 | kfree(privblk); |
| 326 | kfree(mboxblk); | 326 | kfree(mboxblk); |
| 327 | kfree(list); | 327 | kfree(list); |
| 328 | platform_set_drvdata(pdev, NULL); | ||
| 329 | 328 | ||
| 330 | return 0; | 329 | return 0; |
| 331 | } | 330 | } |