Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8961b828 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

[PATCH] parport_cs: don't play games with resources 



pcmcia_request_io() doesn't mark the resource as busy in 2.6., therefore
there's no need to work around the registration of the resources into the
resource tree.

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent c7d00693

drivers/parport/parport_cs.c

+0 −8
Original line number Diff line number Diff line
@@ -226,9 +226,6 @@ void parport_config(dev_link_t *link) 
    CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));

    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));



    release_region(link->io.BasePort1, link->io.NumPorts1);

    if (link->io.NumPorts2)

	release_region(link->io.BasePort2, link->io.NumPorts2);

    p = parport_pc_probe_port(link->io.BasePort1, link->io.BasePort2,

			      link->irq.AssignedIRQ, PARPORT_DMA_NONE,

			      NULL);
@@ -277,11 +274,6 @@ void parport_cs_release(dev_link_t *link) 
    if (info->ndev) {

	struct parport *p = info->port;

	parport_pc_unregister_port(p);

	request_region(link->io.BasePort1, link->io.NumPorts1,

		       info->node.dev_name);

	if (link->io.NumPorts2)

	    request_region(link->io.BasePort2, link->io.NumPorts2,

			   info->node.dev_name);

    }

    info->ndev = 0;

    link->dev = NULL;