diff options
| author | Arnd Bergmann | 2012-01-03 22:22:31 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2012-01-03 22:22:46 +0100 |
| commit | 1fc3eb81100c3f3cd44e706e54390151b0f1ce74 (patch) | |
| tree | 922f64310caa55a3b417958a1c256a96f47c4b66 /drivers/usb/renesas_usbhs/mod.c | |
| parent | Merge branch 'pxa/board' into next/boards (diff) | |
| parent | Merge branch 'imx-features-assorted' of git://git.pengutronix.de/git/imx/linu... (diff) | |
| download | kernel-qcow2-linux-1fc3eb81100c3f3cd44e706e54390151b0f1ce74.tar.gz kernel-qcow2-linux-1fc3eb81100c3f3cd44e706e54390151b0f1ce74.tar.xz kernel-qcow2-linux-1fc3eb81100c3f3cd44e706e54390151b0f1ce74.zip | |
Merge branch 'imx/board' into next/boards
* imx/board: (4 commits)
Enable 32 bit flash support for iMX21ADS board
ARM: mx31pdk: Add MC13783 RTC support
iomux-mx25: configuration to support CSPI3 on CSI pins
MX1:apf9328: Add i2c support
Updated to v3.2-rc6, conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'drivers/usb/renesas_usbhs/mod.c')
| -rw-r--r-- | drivers/usb/renesas_usbhs/mod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/renesas_usbhs/mod.c b/drivers/usb/renesas_usbhs/mod.c index 053f86d70009..ad96a3896729 100644 --- a/drivers/usb/renesas_usbhs/mod.c +++ b/drivers/usb/renesas_usbhs/mod.c @@ -349,7 +349,7 @@ void usbhs_irq_callback_update(struct usbhs_priv *priv, struct usbhs_mod *mod) if (mod->irq_attch) intenb1 |= ATTCHE; - if (mod->irq_attch) + if (mod->irq_dtch) intenb1 |= DTCHE; if (mod->irq_sign) |