aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/ibmtr_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/pcmcia/ibmtr_cs.c')
-rw-r--r--drivers/net/pcmcia/ibmtr_cs.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
index 1b8b44dc4c50..e038d9278a59 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/pcmcia/ibmtr_cs.c
@@ -105,7 +105,7 @@ MODULE_LICENSE("GPL");
105 105
106/*====================================================================*/ 106/*====================================================================*/
107 107
108static void ibmtr_config(struct pcmcia_device *link); 108static int ibmtr_config(struct pcmcia_device *link);
109static void ibmtr_hw_setup(struct net_device *dev, u_int mmiobase); 109static void ibmtr_hw_setup(struct net_device *dev, u_int mmiobase);
110static void ibmtr_release(struct pcmcia_device *link); 110static void ibmtr_release(struct pcmcia_device *link);
111static void ibmtr_detach(struct pcmcia_device *p_dev); 111static void ibmtr_detach(struct pcmcia_device *p_dev);
@@ -174,9 +174,7 @@ static int ibmtr_attach(struct pcmcia_device *link)
174 SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); 174 SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
175 175
176 link->state |= DEV_PRESENT; 176 link->state |= DEV_PRESENT;
177 ibmtr_config(link); 177 return ibmtr_config(link);
178
179 return 0;
180} /* ibmtr_attach */ 178} /* ibmtr_attach */
181 179
182/*====================================================================== 180/*======================================================================
@@ -220,7 +218,7 @@ static void ibmtr_detach(struct pcmcia_device *link)
220#define CS_CHECK(fn, ret) \ 218#define CS_CHECK(fn, ret) \
221do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) 219do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
222 220
223static void ibmtr_config(struct pcmcia_device *link) 221static int ibmtr_config(struct pcmcia_device *link)
224{ 222{
225 ibmtr_dev_t *info = link->priv; 223 ibmtr_dev_t *info = link->priv;
226 struct net_device *dev = info->dev; 224 struct net_device *dev = info->dev;
@@ -323,12 +321,13 @@ static void ibmtr_config(struct pcmcia_device *link)
323 for (i = 0; i < TR_ALEN; i++) 321 for (i = 0; i < TR_ALEN; i++)
324 printk("%02X", dev->dev_addr[i]); 322 printk("%02X", dev->dev_addr[i]);
325 printk("\n"); 323 printk("\n");
326 return; 324 return 0;
327 325
328cs_failed: 326cs_failed:
329 cs_error(link, last_fn, last_ret); 327 cs_error(link, last_fn, last_ret);
330failed: 328failed:
331 ibmtr_release(link); 329 ibmtr_release(link);
330 return -ENODEV;
332} /* ibmtr_config */ 331} /* ibmtr_config */
333 332
334/*====================================================================== 333/*======================================================================