于 2012年06月21日 00:00, Jon Hunter 写道:
On 06/20/2012 04:14 AM, Zumeng Chen wrote:Since it's no more sense to set parent for dummy clock, so we can just ignore it to mute failed message. Signed-off-by: Jon Hunter<jon-hunter@xxxxxx> Signed-off-by: Zumeng Chen<zumeng.chen@xxxxxxxxx> --- arch/arm/plat-omap/clock.c | 4 ++++ drivers/mfd/omap-usb-host.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 62ec5c4..c7e26e4 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c @@ -149,6 +149,10 @@ int clk_set_parent(struct clk *clk, struct clk *parent) if (!arch_clock || !arch_clock->clk_set_parent) return ret; + /* If the clock is a dummy clock just return */ + if (clk ==&dummy_ck) + return 0; + spin_lock_irqsave(&clockfw_lock, flags); if (clk->usecount == 0) { ret = arch_clock->clk_set_parent(clk, parent); diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index 7e96bb2..c9d27c4 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c @@ -699,7 +699,7 @@ static int __devinit usbhs_omap_probe(struct platform_device *pdev) } if (is_ehci_phy_mode(pdata->port_mode[0])) { - /* for OMAP3 , the clk set paretn fails */ + /* for OMAP3 , the clk set parent fails */Can't we remove this comment now with the above fix? It is no longer relevant, right?
Yes, NP. Regards, Zumeng
Cheers Jon -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
-- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
