Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / drivers / bluetooth / dtl1_cs.c

diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 6e8d9618968443df06710d52666aaf5e5c2af3bd..97a7784db4a2d4b6431aa2e15d8ff122b40ccdf4 100644 (file)
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -144,9 +144,9 @@ static void dtl1_write_wakeup(dtl1_info_t *info)
        }
 
        do {
-               register unsigned int iobase = info->p_dev->resource[0]->start;
+               unsigned int iobase = info->p_dev->resource[0]->start;
                register struct sk_buff *skb;
-               register int len;
+               int len;
 
                clear_bit(XMIT_WAKEUP, &(info->tx_state));
 
@@ -586,29 +586,31 @@ static int dtl1_confcheck(struct pcmcia_device *p_dev, void *priv_data)
 static int dtl1_config(struct pcmcia_device *link)
 {
        dtl1_info_t *info = link->priv;
-       int i;
+       int ret;
 
        /* Look for a generic full-sized window */
        link->resource[0]->end = 8;
-       if (pcmcia_loop_config(link, dtl1_confcheck, NULL) < 0)
+       ret = pcmcia_loop_config(link, dtl1_confcheck, NULL);
+       if (ret)
                goto failed;
 
-       i = pcmcia_request_irq(link, dtl1_interrupt);
-       if (i != 0)
+       ret = pcmcia_request_irq(link, dtl1_interrupt);
+       if (ret)
                goto failed;
 
-       i = pcmcia_enable_device(link);
-       if (i != 0)
+       ret = pcmcia_enable_device(link);
+       if (ret)
                goto failed;
 
-       if (dtl1_open(info) != 0)
+       ret = dtl1_open(info);
+       if (ret)
                goto failed;
 
        return 0;
 
 failed:
        dtl1_detach(link);
-       return -ENODEV;
+       return ret;
 }
 
 static const struct pcmcia_device_id dtl1_ids[] = {