1 files changed, 21 insertions, 20 deletions

diff --git a/arch/sparc/kernel/ldc.c b/arch/sparc/kernel/ldc.c
index 66dacd56bb10..27bb55485472 100644
--- a/arch/sparc/kernel/ldc.c
+++ b/arch/sparc/kernel/ldc.c
@@ -1078,7 +1078,8 @@ static void ldc_iommu_release(struct ldc_channel *lp)
 
 struct ldc_channel *ldc_alloc(unsigned long id,
                               const struct ldc_channel_config *cfgp,
-                              void *event_arg)
+                              void *event_arg,
+                              const char *name)
 {
         struct ldc_channel *lp;
         const struct ldc_mode_ops *mops;
@@ -1093,6 +1094,8 @@ struct ldc_channel *ldc_alloc(unsigned long id,
         err = -EINVAL;
         if (!cfgp)
                 goto out_err;
+        if (!name)
+                goto out_err;
 
         switch (cfgp->mode) {
         case LDC_MODE_RAW:
@@ -1185,6 +1188,21 @@ struct ldc_channel *ldc_alloc(unsigned long id,
 
         INIT_HLIST_HEAD(&lp->mh_list);
 
+        snprintf(lp->rx_irq_name, LDC_IRQ_NAME_MAX, "%s RX", name);
+        snprintf(lp->tx_irq_name, LDC_IRQ_NAME_MAX, "%s TX", name);
+
+        err = request_irq(lp->cfg.rx_irq, ldc_rx, 0,
+                          lp->rx_irq_name, lp);
+        if (err)
+                goto out_free_txq;
+
+        err = request_irq(lp->cfg.tx_irq, ldc_tx, 0,
+                          lp->tx_irq_name, lp);
+        if (err) {
+                free_irq(lp->cfg.rx_irq, lp);
+                goto out_free_txq;
+        }
+
         return lp;
 
 out_free_txq:
@@ -1237,31 +1255,14 @@ EXPORT_SYMBOL(ldc_free);
  * state.  This does not initiate a handshake, ldc_connect() does
  * that.
  */
-int ldc_bind(struct ldc_channel *lp, const char *name)
+int ldc_bind(struct ldc_channel *lp)
 {
         unsigned long hv_err, flags;
         int err = -EINVAL;
 
-        if (!name ||
-            (lp->state != LDC_STATE_INIT))
+        if (lp->state != LDC_STATE_INIT)
                 return -EINVAL;
 
-        snprintf(lp->rx_irq_name, LDC_IRQ_NAME_MAX, "%s RX", name);
-        snprintf(lp->tx_irq_name, LDC_IRQ_NAME_MAX, "%s TX", name);
-
-        err = request_irq(lp->cfg.rx_irq, ldc_rx, 0,
-                          lp->rx_irq_name, lp);
-        if (err)
-                return err;
-
-        err = request_irq(lp->cfg.tx_irq, ldc_tx, 0,
-                          lp->tx_irq_name, lp);
-        if (err) {
-                free_irq(lp->cfg.rx_irq, lp);
-                return err;
-        }
-
-
         spin_lock_irqsave(&lp->lock, flags);
 
         enable_irq(lp->cfg.rx_irq);