From babe2f7d3e429061a641dc886626514444742ad6 Mon Sep 17 00:00:00 2001 From: Ajay Kumar Gupta Date: Tue, 4 May 2010 13:15:23 +0530 Subject: [PATCH] --- yaml --- r: 195423 b: refs/heads/master c: 97dc7c61f1a25e906c0eb65fac2573e1ce063d63 h: refs/heads/master i: 195421: 5784fd232ed3c7ca9916d90174a2675e4f6dfe5e 195419: 267802fdc7393cac73b0e71e740b6bb19c9f29ed 195415: 9446edcc8ce268e5a19ddebf8742c42fece65f15 195407: afcd3c48878169ae40cf91cd5a2524ad1fc42903 195391: cf713ba71a29d0857ee4faa2f7071755a68fadc0 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-omap.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0a5bd2a0df8a..064d7f0767ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 289621c31bffb743e4007f6332b9004cdd080644 +refs/heads/master: 97dc7c61f1a25e906c0eb65fac2573e1ce063d63 diff --git a/trunk/drivers/usb/host/ehci-omap.c b/trunk/drivers/usb/host/ehci-omap.c index 711332ebdab5..992d963b91fc 100644 --- a/trunk/drivers/usb/host/ehci-omap.c +++ b/trunk/drivers/usb/host/ehci-omap.c @@ -352,8 +352,8 @@ static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd) reg &= ~OMAP_UHH_HOSTCONFIG_P3_CONNECT_STATUS; /* Bypass the TLL module for PHY mode operation */ - if (omap_rev() <= OMAP3430_REV_ES2_1) { - dev_dbg(omap->dev, "OMAP3 ES version <= ES2.1 \n"); + if (cpu_is_omap3430() && (omap_rev() <= OMAP3430_REV_ES2_1)) { + dev_dbg(omap->dev, "OMAP3 ES version <= ES2.1\n"); if ((omap->port_mode[0] == EHCI_HCD_OMAP_MODE_PHY) || (omap->port_mode[1] == EHCI_HCD_OMAP_MODE_PHY) || (omap->port_mode[2] == EHCI_HCD_OMAP_MODE_PHY))