[SCSI] Merge up to linux-2.6 head

Conflicts:

	drivers/scsi/jazz_esp.c

Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 4fd2bec89916..75aad38179f0 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1424,7 +1424,7 @@ unsigned int mpic_get_irq(void)
 void mpic_request_ipis(void)
 {
         struct mpic *mpic = mpic_primary;
-        int i;
+        int i, err;
         static char *ipi_names[] = {
                 "IPI0 (call function)",
                 "IPI1 (reschedule)",
@@ -1442,8 +1442,14 @@ void mpic_request_ipis(void)
                         printk(KERN_ERR "Failed to map IPI %d\n", i);
                         break;
                 }
-                request_irq(vipi, mpic_ipi_action, IRQF_DISABLED|IRQF_PERCPU,
-                            ipi_names[i], mpic);
+                err = request_irq(vipi, mpic_ipi_action,
+                                  IRQF_DISABLED|IRQF_PERCPU,
+                                  ipi_names[i], mpic);
+                if (err) {
+                        printk(KERN_ERR "Request of irq %d for IPI %d failed\n",
+                               vipi, i);
+                        break;
+                }
         }
 }