diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-29 21:45:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-29 21:45:55 -0400 |
commit | df9b17f5868bdafd46cad18b08f1e70fa22b8854 (patch) | |
tree | 5667fbd3a0b915463f9558e3d40de309b7a7c0de /drivers/usb/chipidea/core.c | |
parent | f1ddc24c9e33813f74b871d73e4d795dcdb95a3c (diff) | |
parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 (diff) |
Merge 3.12-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/chipidea/core.c')
-rw-r--r-- | drivers/usb/chipidea/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index d847e73bca18..c47a6b46dea3 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c | |||
@@ -604,6 +604,7 @@ static int ci_hdrc_remove(struct platform_device *pdev) | |||
604 | dbg_remove_files(ci); | 604 | dbg_remove_files(ci); |
605 | free_irq(ci->irq, ci); | 605 | free_irq(ci->irq, ci); |
606 | ci_role_destroy(ci); | 606 | ci_role_destroy(ci); |
607 | kfree(ci->hw_bank.regmap); | ||
607 | 608 | ||
608 | return 0; | 609 | return 0; |
609 | } | 610 | } |