summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/tegra3_usb_phy.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-tegra/tegra3_usb_phy.c')
-rw-r--r--arch/arm/mach-tegra/tegra3_usb_phy.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/tegra3_usb_phy.c b/arch/arm/mach-tegra/tegra3_usb_phy.c
index 338b7e6284b0..7253a15af67a 100644
--- a/arch/arm/mach-tegra/tegra3_usb_phy.c
+++ b/arch/arm/mach-tegra/tegra3_usb_phy.c
@@ -1076,8 +1076,9 @@ static unsigned int utmi_phy_xcvr_setup_value(struct tegra_usb_phy *phy)
if (cfg->xcvr_use_fuses) {
val = XCVR_SETUP(tegra_fuse_readl(FUSE_USB_CALIB_0));
if (cfg->xcvr_use_lsb) {
- val = min(((val & XCVR_SETUP_LSB_MASK) + cfg->xcvr_setup_offset),
- XCVR_SETUP_LSB_MAX_VAL);
+ val = min((unsigned int) ((val & XCVR_SETUP_LSB_MASK)
+ + cfg->xcvr_setup_offset),
+ (unsigned int) XCVR_SETUP_LSB_MAX_VAL);
val |= (cfg->xcvr_setup & XCVR_SETUP_MSB_MASK);
} else {
if (cfg->xcvr_setup_offset <= UTMIP_XCVR_MAX_OFFSET)