diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /drivers/pci/htirq.c | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'drivers/pci/htirq.c')
| -rw-r--r-- | drivers/pci/htirq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/htirq.c b/drivers/pci/htirq.c index 279c940a0039..bf7d6ce9bbb3 100644 --- a/drivers/pci/htirq.c +++ b/drivers/pci/htirq.c | |||
| @@ -126,7 +126,8 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update) | |||
| 126 | cfg->msg.address_hi = 0xffffffff; | 126 | cfg->msg.address_hi = 0xffffffff; |
| 127 | 127 | ||
| 128 | irq = create_irq(); | 128 | irq = create_irq(); |
| 129 | if (irq < 0) { | 129 | |
| 130 | if (irq <= 0) { | ||
| 130 | kfree(cfg); | 131 | kfree(cfg); |
| 131 | return -EBUSY; | 132 | return -EBUSY; |
| 132 | } | 133 | } |