This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / scsi / arm / arxescsi.c

diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index 8397c63..cd5a63c 100644 (file)
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -286,12 +286,14 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
        unsigned char *base;
        int ret;
 
-       ret = ecard_request_resources(ec);
-       if (ret)
-               goto out;
-
        resbase = ecard_resource_start(ec, ECARD_RES_MEMC);
        reslen = ecard_resource_len(ec, ECARD_RES_MEMC);
+
+       if (!request_mem_region(resbase, reslen, "arxescsi")) {
+               ret = -EBUSY;
+               goto out;
+       }
+
        base = ioremap(resbase, reslen);
        if (!base) {
                ret = -ENOMEM;
@@ -343,7 +345,7 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
  out_unmap:
        iounmap(base);
  out_region:
-       ecard_release_resources(ec);
+       release_mem_region(resbase, reslen);
  out:
        return ret;
 }
@@ -351,15 +353,20 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 static void __devexit arxescsi_remove(struct expansion_card *ec)
 {
        struct Scsi_Host *host = ecard_get_drvdata(ec);
+       unsigned long resbase, reslen;
 
        ecard_set_drvdata(ec, NULL);
        fas216_remove(host);
 
        iounmap((void *)host->base);
 
+       resbase = ecard_resource_start(ec, ECARD_RES_MEMC);
+       reslen = ecard_resource_len(ec, ECARD_RES_MEMC);
+
+       release_mem_region(resbase, reslen);
+
        fas216_release(host);
        scsi_host_put(host);
-       ecard_release_resources(ec);
 }
 
 static const struct ecard_id arxescsi_cids[] = {