diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
| commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
| tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /drivers/usb/host/ohci-pxa27x.c | |
| parent | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
Diffstat (limited to 'drivers/usb/host/ohci-pxa27x.c')
| -rw-r--r-- | drivers/usb/host/ohci-pxa27x.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index bbc0c3b720b2..f1c06202fdf2 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c | |||
| @@ -177,9 +177,13 @@ static inline void pxa27x_setup_hc(struct pxa27x_ohci *ohci, | |||
| 177 | 177 | ||
| 178 | if (inf->flags & NO_OC_PROTECTION) | 178 | if (inf->flags & NO_OC_PROTECTION) |
| 179 | uhcrhda |= UHCRHDA_NOCP; | 179 | uhcrhda |= UHCRHDA_NOCP; |
| 180 | else | ||
| 181 | uhcrhda &= ~UHCRHDA_NOCP; | ||
| 180 | 182 | ||
| 181 | if (inf->flags & OC_MODE_PERPORT) | 183 | if (inf->flags & OC_MODE_PERPORT) |
| 182 | uhcrhda |= UHCRHDA_OCPM; | 184 | uhcrhda |= UHCRHDA_OCPM; |
| 185 | else | ||
| 186 | uhcrhda &= ~UHCRHDA_OCPM; | ||
| 183 | 187 | ||
| 184 | if (inf->power_on_delay) { | 188 | if (inf->power_on_delay) { |
| 185 | uhcrhda &= ~UHCRHDA_POTPGT(0xff); | 189 | uhcrhda &= ~UHCRHDA_POTPGT(0xff); |