diff --git a/[refs] b/[refs] index 071301c48082..3b72c37ff9f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bea5b9035dae264e5da4a8a6aacc8bace0647c35 +refs/heads/master: 1b69a7577a2a67841c0a6fb742392457a7aa989c diff --git a/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c b/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c index 4043d02bd6ba..e0adf23bd527 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c +++ b/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c @@ -378,14 +378,9 @@ static int cs_attach(struct pcmcia_device *link) return 0; } -static void cs_release(struct pcmcia_device *link) -{ - pcmcia_disable_device(link); -} - static void cs_detach(struct pcmcia_device *link) { - cs_release(link); + pcmcia_disable_device(link); } static const struct pcmcia_device_id ni_mio_cs_ids[] = {