diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-07 06:46:56 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-07 06:46:56 -0400 |
| commit | 9f9e4266a66b6f9dcde305e85035615c06bdb7f7 (patch) | |
| tree | c6f867c7a1bf94a3b4f13b19a9ce442c7aec9e79 /drivers/mailbox | |
| parent | bf551413038f74343ec4d1413c3610e2362d0aeb (diff) | |
| parent | 249ce1387b7739dbea2ac1a697e4bf1e37ec06b7 (diff) | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-twl6040
Diffstat (limited to 'drivers/mailbox')
| -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 | } |