Hi,
On Mon, May 09, 2011 at 02:40:03PM +0530, Keshava Munegowda wrote:
> From: Keshava Munegowda <[email protected]>
>
> the disabling of clocks and freeing GPIO are changed
> to fix the occurence of the crash of rmmod of ehci and ohci
> drivers
>
> Signed-off-by: Keshava Munegowda <[email protected]>
NAK
> ---
> drivers/mfd/omap-usb-host.c | 24 ++++++++++++++++--------
> 1 files changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
> index 3ab9ffa..cda0797 100644
> --- a/drivers/mfd/omap-usb-host.c
> +++ b/drivers/mfd/omap-usb-host.c
> @@ -939,6 +939,7 @@ static void usbhs_disable(struct device *dev)
> struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
> struct usbhs_omap_platform_data *pdata = &omap->platdata;
> unsigned long flags = 0;
> + unsigned int halt = 0;
you shouldn't need this.
> @@ -994,24 +995,31 @@ static void usbhs_disable(struct device *dev)
> dev_dbg(dev, "operation timed out\n");
> }
>
> - if (pdata->ehci_data->phy_reset) {
> - if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0]))
> - gpio_free(pdata->ehci_data->reset_gpio_port[0]);
> -
> - if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1]))
> - gpio_free(pdata->ehci_data->reset_gpio_port[1]);
> + if (is_omap_usbhs_rev2(omap)) {
> + if (is_ehci_tll_mode(pdata->port_mode[0]))
> + clk_enable(omap->usbtll_p1_fck);
> + if (is_ehci_tll_mode(pdata->port_mode[1]))
> + clk_enable(omap->usbtll_p2_fck);
> + clk_disable(omap->utmi_p2_fck);
> + clk_disable(omap->utmi_p1_fck);
> }
>
> - clk_disable(omap->utmi_p2_fck);
> - clk_disable(omap->utmi_p1_fck);
> clk_disable(omap->usbtll_ick);
> clk_disable(omap->usbtll_fck);
> clk_disable(omap->usbhost_fs_fck);
> clk_disable(omap->usbhost_hs_fck);
> clk_disable(omap->usbhost_ick);
> + halt = 1;
at least from this diff, you're always reaching that part of the code
rendering this halt flag useless.
--
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
