2 files changed, 9 insertions, 4 deletions

diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index ae84a1018a89..0639ec0ed015 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -191,7 +191,7 @@ simeth_probe1(void)
         unsigned char mac_addr[ETH_ALEN];
         struct simeth_local *local;
         struct net_device *dev;
-        int fd, i, err;
+        int fd, i, err, rc;
 
         /*
          * XXX Fix me
@@ -228,7 +228,9 @@ simeth_probe1(void)
                 return err;
         }
 
-        dev->irq = assign_irq_vector(AUTO_ASSIGN);
+        if ((rc = assign_irq_vector(AUTO_ASSIGN)) < 0)
+                panic("%s: out of interrupt vectors!\n", __FUNCTION__);
+        dev->irq = rc;
 
         /*
          * attach the interrupt in the simulator, this does enable interrupts
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 7a8ae0f4b387..7dcb8582ae0d 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -982,7 +982,7 @@ static struct tty_operations hp_ops = {
 static int __init
 simrs_init (void)
 {
-        int                     i;
+        int                     i, rc;
         struct serial_state     *state;
 
         if (!ia64_platform_is("hpsim"))
@@ -1017,7 +1017,10 @@ simrs_init (void)
                 if (state->type == PORT_UNKNOWN) continue;
 
                 if (!state->irq) {
-                        state->irq = assign_irq_vector(AUTO_ASSIGN);
+                        if ((rc = assign_irq_vector(AUTO_ASSIGN)) < 0)
+                                panic("%s: out of interrupt vectors!\n",
+                                      __FUNCTION__);
+                        state->irq = rc;
                         ia64_ssc_connect_irq(KEYBOARD_INTR, state->irq);
                 }