This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index 70ba49f..5f037d2 100644 (file)
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -525,12 +525,14 @@ eesoxscsi_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_IOCFAST);
        reslen = ecard_resource_len(ec, ECARD_RES_IOCFAST);
+
+       if (!request_mem_region(resbase, reslen, "eesoxscsi")) {
+               ret = -EBUSY;
+               goto out;
+       }
+
        base = ioremap(resbase, reslen);
        if (!base) {
                ret = -ENOMEM;
@@ -620,7 +622,7 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
        iounmap(base);
 
  out_region:
-       ecard_release_resources(ec);
+       release_mem_region(resbase, reslen);
 
  out:
        return ret;
@@ -630,6 +632,7 @@ static void __devexit eesoxscsi_remove(struct expansion_card *ec)
 {
        struct Scsi_Host *host = ecard_get_drvdata(ec);
        struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
+       unsigned long resbase, reslen;
 
        ecard_set_drvdata(ec, NULL);
        fas216_remove(host);
@@ -642,9 +645,13 @@ static void __devexit eesoxscsi_remove(struct expansion_card *ec)
 
        iounmap((void *)host->base);
 
+       resbase = ecard_resource_start(ec, ECARD_RES_IOCFAST);
+       reslen = ecard_resource_len(ec, ECARD_RES_IOCFAST);
+
+       release_mem_region(resbase, reslen);
+
        fas216_release(host);
        scsi_host_put(host);
-       ecard_release_resources(ec);
 }
 
 static const struct ecard_id eesoxscsi_cids[] = {