|
@@ -184,11 +184,6 @@ static void dio24_detach(struct comedi_device *dev)
|
|
|
free_irq(dev->irq, dev);
|
|
|
};
|
|
|
|
|
|
-struct local_info_t {
|
|
|
- struct pcmcia_device *link;
|
|
|
- struct bus_operations *bus;
|
|
|
-};
|
|
|
-
|
|
|
static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev,
|
|
|
void *priv_data)
|
|
|
{
|
|
@@ -200,17 +195,8 @@ static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev,
|
|
|
|
|
|
static int dio24_cs_attach(struct pcmcia_device *link)
|
|
|
{
|
|
|
- struct local_info_t *local;
|
|
|
int ret;
|
|
|
|
|
|
- local = kzalloc(sizeof(*local), GFP_KERNEL);
|
|
|
- if (!local)
|
|
|
- return -ENOMEM;
|
|
|
- local->link = link;
|
|
|
- link->priv = local;
|
|
|
-
|
|
|
- pcmcia_cur_dev = link;
|
|
|
-
|
|
|
link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_AUDIO |
|
|
|
CONF_AUTO_SET_IO;
|
|
|
|
|
@@ -227,6 +213,8 @@ static int dio24_cs_attach(struct pcmcia_device *link)
|
|
|
if (ret)
|
|
|
goto failed;
|
|
|
|
|
|
+ pcmcia_cur_dev = link;
|
|
|
+
|
|
|
return 0;
|
|
|
|
|
|
failed:
|
|
@@ -237,9 +225,6 @@ failed:
|
|
|
static void dio24_cs_detach(struct pcmcia_device *link)
|
|
|
{
|
|
|
pcmcia_disable_device(link);
|
|
|
-
|
|
|
- /* This points to the parent local_info_t struct */
|
|
|
- kfree(link->priv);
|
|
|
}
|
|
|
|
|
|
static const struct pcmcia_device_id dio24_cs_ids[] = {
|