Bluetooth: cleanup dtl1_config
authorDevendra Naga <devendra.aaru@gmail.com>
Tue, 19 Jun 2012 16:21:31 +0000 (21:51 +0530)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Sat, 30 Jun 2012 14:44:36 +0000 (11:44 -0300)
Improve the error handling of dtl1_config()

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
drivers/bluetooth/dtl1_cs.c

index b1b37ccd3cd489ad41117e2293040df4784eed31..97a7784db4a2d4b6431aa2e15d8ff122b40ccdf4 100644 (file)
@@ -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[] = {