[PATCH 2/2] usb: fsl_mxc_udc.c: fix mxc_ahb_clk disable for i.MX25

From: Eric BÃnard
Date: Tue May 08 2012 - 03:18:49 EST


as i.MX35, i.MX25 doesn't have this clock so don't try to disable/put it.

Signed-off-by: Eric BÃnard <eric@xxxxxxxxxx>
Cc: Sascha Hauer <kernel@xxxxxxxxxxxxxx>
---
drivers/usb/gadget/fsl_mxc_udc.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/gadget/fsl_mxc_udc.c b/drivers/usb/gadget/fsl_mxc_udc.c
index 8bbf673..4e30fb6 100644
--- a/drivers/usb/gadget/fsl_mxc_udc.c
+++ b/drivers/usb/gadget/fsl_mxc_udc.c
@@ -78,10 +78,10 @@ eclkrate:
clk_put(mxc_usb_clk);
mxc_usb_clk = NULL;
egusb:
- if (!cpu_is_mx35())
+ if (!cpu_is_mx35() && !cpu_is_mx25())
clk_disable(mxc_ahb_clk);
eenahb:
- if (!cpu_is_mx35())
+ if (!cpu_is_mx35() && !cpu_is_mx25())
clk_put(mxc_ahb_clk);
return ret;
}
@@ -120,7 +120,7 @@ void fsl_udc_clk_release(void)
clk_disable(mxc_usb_clk);
clk_put(mxc_usb_clk);
}
- if (!cpu_is_mx35()) {
+ if (!cpu_is_mx35() && !cpu_is_mx25()) {
clk_disable(mxc_ahb_clk);
clk_put(mxc_ahb_clk);
}
--
1.7.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/