From: Dan Williams <dan.j.williams@intel.com>
Date: Tue, 15 May 2007 00:03:31 +0000 (+0100)
Subject: [ARM] 4382/1: iop13xx: fix msi support
X-Git-Tag: v2.6.22-rc3~112^2~17
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e702a7155d14a6e11645e17d829217ae98fd45bb;p=linux-2.6

[ARM] 4382/1: iop13xx: fix msi support

updates iop13xx msi support for a msi api change in 2.6.22

rev7:
* update for Michael Ellerman's "MSI: arch must connect the irq and the
  msi_desc" patch

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-iop13xx/msi.c b/arch/arm/mach-iop13xx/msi.c
index 2d23693022..062d2acdd5 100644
--- a/arch/arm/mach-iop13xx/msi.c
+++ b/arch/arm/mach-iop13xx/msi.c
@@ -190,5 +190,5 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
 	write_msi_msg(irq, &msg);
 	set_irq_chip_and_handler(irq, &iop13xx_msi_chip, handle_simple_irq);
 
-	return irq;
+	return 0;
 }