diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 14:55:48 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 14:55:48 +0100 |
| commit | db1b39d8b860e3716620c225bc86e0ec41764e34 (patch) | |
| tree | 8739074db733ef767400ea92cfbfed9352ddb92d /drivers/usb/misc/uss720.c | |
| parent | a6bc432e296dfa1f05d4b586ca5ca3085a2d42d7 (diff) | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/misc/uss720.c')
| -rw-r--r-- | drivers/usb/misc/uss720.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c index 70250252ae2..1a60f9c473a 100644 --- a/drivers/usb/misc/uss720.c +++ b/drivers/usb/misc/uss720.c @@ -336,7 +336,7 @@ static int uss720_irq(int usbstatus, void *buffer, int len, void *dev_id) memcpy(priv->reg, buffer, 4); /* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */ if (priv->reg[2] & priv->reg[1] & 0x10) - parport_generic_irq(0, pp, NULL); + parport_generic_irq(0, pp); return 1; } #endif |