aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2006-01-15 02:30:40 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2006-03-31 10:03:01 -0500
commit8961b828667e715a96d9d8517f7c8b6552ead3bb (patch)
tree0b6b85a886c09285f4e0a7c758a91a4ebac3f765
parentc7d006935dfda9174187aa557e94a137ced10c30 (diff)
[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: Dominik Brodowski <linux@dominikbrodowski.net>
-rw-r--r--drivers/parport/parport_cs.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index 158d92563259..d0fc8be56954 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -226,9 +226,6 @@ void parport_config(dev_link_t *link)
226 CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq)); 226 CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
227 CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf)); 227 CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
228 228
229 release_region(link->io.BasePort1, link->io.NumPorts1);
230 if (link->io.NumPorts2)
231 release_region(link->io.BasePort2, link->io.NumPorts2);
232 p = parport_pc_probe_port(link->io.BasePort1, link->io.BasePort2, 229 p = parport_pc_probe_port(link->io.BasePort1, link->io.BasePort2,
233 link->irq.AssignedIRQ, PARPORT_DMA_NONE, 230 link->irq.AssignedIRQ, PARPORT_DMA_NONE,
234 NULL); 231 NULL);
@@ -277,11 +274,6 @@ void parport_cs_release(dev_link_t *link)
277 if (info->ndev) { 274 if (info->ndev) {
278 struct parport *p = info->port; 275 struct parport *p = info->port;
279 parport_pc_unregister_port(p); 276 parport_pc_unregister_port(p);
280 request_region(link->io.BasePort1, link->io.NumPorts1,
281 info->node.dev_name);
282 if (link->io.NumPorts2)
283 request_region(link->io.BasePort2, link->io.NumPorts2,
284 info->node.dev_name);
285 } 277 }
286 info->ndev = 0; 278 info->ndev = 0;
287 link->dev = NULL; 279 link->dev = NULL;