From 34322bb6c97534d7ee00582053a52f75e8d53a16 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 25 Jan 2013 14:59:36 -0700 Subject: [PATCH] --- yaml --- r: 354230 b: refs/heads/master c: 86be5680f5804690654519751ed77aaa54b01826 h: refs/heads/master v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/quatech_daqp_cs.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 97b1700f5e09..68c9a1c371e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1db2a4134bb486b28f943baac175e3edcc51053 +refs/heads/master: 86be5680f5804690654519751ed77aaa54b01826 diff --git a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c index 748aa6a7a88a..b2b755f031b1 100644 --- a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c @@ -936,13 +936,6 @@ static int daqp_cs_resume(struct pcmcia_device *link) return 0; } -static void daqp_cs_release(struct pcmcia_device *link) -{ - dev_dbg(&link->dev, "daqp_cs_release\n"); - - pcmcia_disable_device(link); -} - static int daqp_pcmcia_config_loop(struct pcmcia_device *p_dev, void *priv_data) { if (p_dev->config_index == 0) @@ -976,7 +969,7 @@ static void daqp_cs_config(struct pcmcia_device *link) return; failed: - daqp_cs_release(link); + pcmcia_disable_device(link); } static int daqp_cs_attach(struct pcmcia_device *link) @@ -1014,7 +1007,7 @@ static void daqp_cs_detach(struct pcmcia_device *link) struct local_info_t *dev = link->priv; dev->stop = 1; - daqp_cs_release(link); + pcmcia_disable_device(link); /* Unlink device structure, and free it */ dev_table[dev->table_index] = NULL;