projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mfd
/
omap-usb-host.c
diff --git
a/drivers/mfd/omap-usb-host.c
b/drivers/mfd/omap-usb-host.c
index 1717144fe7f4f220f6cd79ccea856f39f87ecac3..e67c3d3e38b3bc310b467c9bd3f665a38d6b7951 100644
(file)
--- a/
drivers/mfd/omap-usb-host.c
+++ b/
drivers/mfd/omap-usb-host.c
@@
-676,7
+676,6
@@
static void usbhs_omap_tll_init(struct device *dev, u8 tll_channel_count)
| OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF
| OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE);
| OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF
| OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE);
- reg |= (1 << (i + 1));
} else
continue;
} else
continue;