diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 10:49:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 10:49:06 -0800 |
| commit | 8364919c5698d934860aabc607ffd32b13c8c37c (patch) | |
| tree | 8d11db5c61d442f9bfc4499e56353ac120af6f8b /drivers/usb | |
| parent | d3569d163cba40f9c5682df083dbed3f049478a4 (diff) | |
| parent | 7f788ec07d169123bb1bd14e6221a2b228079ce8 (diff) | |
| download | op-kernel-dev-8364919c5698d934860aabc607ffd32b13c8c37c.zip op-kernel-dev-8364919c5698d934860aabc607ffd32b13c8c37c.tar.gz | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
USB: EHCI: Don't use NO_IRQ in xilinx ehci driver
microblaze: Add topology init
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/ehci-xilinx-of.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c index 32793ce..9c2cc46 100644 --- a/drivers/usb/host/ehci-xilinx-of.c +++ b/drivers/usb/host/ehci-xilinx-of.c @@ -183,7 +183,7 @@ static int __devinit ehci_hcd_xilinx_of_probe(struct platform_device *op) } irq = irq_of_parse_and_map(dn, 0); - if (irq == NO_IRQ) { + if (!irq) { printk(KERN_ERR "%s: irq_of_parse_and_map failed\n", __FILE__); rv = -EBUSY; goto err_irq; |
