USB: ehci-ppc-of: problems in unwind
authorDan Carpenter <error27@gmail.com>
Sat, 14 Aug 2010 09:06:19 +0000 (11:06 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 20 Sep 2010 20:17:46 +0000 (13:17 -0700)
commit3fd4a383a86980639a951496de13b6be16531345
treecc7a6a72973748610f5ce326126ac7e28d8c0203
parent18b4e9d89260347957cc39f200e8563f51ff970f
USB: ehci-ppc-of: problems in unwind

commit 08a3b3b1c2e622e378d9086aee9e2e42ce37591d upstream.

The iounmap(ehci->ohci_hcctrl_reg); should be the first thing we do
because the ioremap() was the last thing we did.  Also if we hit any of
the goto statements in the original code then it would have led to a
NULL dereference of "ehci".  This bug was introduced in: 796bcae7361c
"USB: powerpc: Workaround for the PPC440EPX USBH_23 errata [take 3]"

I modified the few lines in front a little so that my code didn't
obscure the return success code path.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/host/ehci-ppc-of.c