diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:56:44 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:56:44 -0500 |
| commit | 4045407fd7740642b18bc802e8bab064e79a61e5 (patch) | |
| tree | 9412a38886bfad562bc5897c6e4c23bb88703204 /drivers/usb/renesas_usbhs/mod.c | |
| parent | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (diff) | |
| parent | 4c5f830c4c9d4f19c1eef356c0cd322b46d695c9 (diff) | |
Merge branch 'restart-cleanup' into restart
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) | |||
| 349 | if (mod->irq_attch) | 349 | if (mod->irq_attch) |
| 350 | intenb1 |= ATTCHE; | 350 | intenb1 |= ATTCHE; |
| 351 | 351 | ||
| 352 | if (mod->irq_attch) | 352 | if (mod->irq_dtch) |
| 353 | intenb1 |= DTCHE; | 353 | intenb1 |= DTCHE; |
| 354 | 354 | ||
| 355 | if (mod->irq_sign) | 355 | if (mod->irq_sign) |