2012-06-19 16:21:31

by devendra.aaru

Subject: [PATCH] Bluetooth: cleanup dtl1_config

Signed-off-by: Devendra Naga <[email protected]>
---
drivers/bluetooth/dtl1_cs.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 6e8d961..aedcf4a 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -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[] = {
--
1.7.9.5

2012-06-30 14:45:33

by Gustavo Padovan

Subject: Re: [PATCH] Bluetooth: cleanup dtl1_config

Hi Devendra,

* Devendra Naga <[email protected]> [2012-06-19 21:51:31 +0530]:

>
> Signed-off-by: Devendra Naga <[email protected]>
> ---
> drivers/bluetooth/dtl1_cs.c | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)

Patch has been applied to bluetooth-next, thanks.

Gustavo