7 files changed, 38 insertions, 33 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 5108e9739c96..31fc76960a8f 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -508,15 +508,22 @@ int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd,
        return (flags & REQ_FAILED) ? -EIO : 0;
 }
-static void ide_cd_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd)
+/*
+ * returns true if rq has been completed
+ */
+static bool ide_cd_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd)
 {
        unsigned int nr_bytes = cmd->nbytes - cmd->nleft;
        if (cmd->tf_flags & IDE_TFLAG_WRITE)
                nr_bytes -= cmd->last_xfer_len;
-        if (nr_bytes > 0)
+        if (nr_bytes > 0) {
                ide_complete_rq(drive, 0, nr_bytes);
+                return true;
+        }
+        return false;
 }
 static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
@@ -681,7 +688,8 @@ out_end:
                }
                if (uptodate == 0 && rq->bio)
-                        ide_cd_error_cmd(drive, cmd);
+                        if (ide_cd_error_cmd(drive, cmd))
+                                return ide_stopped;
                /* make sure it's fully ended */
                if (rq->cmd_type != REQ_TYPE_FS) {
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index 0b7815d2581c..2a4cb9c18f01 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -43,7 +43,6 @@
 #include <asm/io.h>
 #include <asm/system.h>
-#include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
@@ -98,9 +97,8 @@ static int ide_probe(struct pcmcia_device *link)
    info->p_dev = link;
    link->priv = info;
-    link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+    link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
-    link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
+    link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
-    link->io.IOAddrLines = 3;
    link->conf.Attributes = CONF_ENABLE_IRQ;
    link->conf.IntType = INT_MEMORY_AND_IO;
@@ -229,24 +227,27 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev,
        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
+                pdev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
                pdev->conf.ConfigIndex = cfg->index;
-                pdev->io.BasePort1 = io->win[0].base;
+                pdev->resource[0]->start = io->win[0].base;
-                pdev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                if (!(io->flags & CISTPL_IO_16BIT)) {
-                if (!(io->flags & CISTPL_IO_16BIT))
+                        pdev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-                        pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                        pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
+                }
                if (io->nwin == 2) {
-                        pdev->io.NumPorts1 = 8;
+                        pdev->resource[0]->end = 8;
-                        pdev->io.BasePort2 = io->win[1].base;
+                        pdev->resource[1]->start = io->win[1].base;
-                        pdev->io.NumPorts2 = (stk->is_kme) ? 2 : 1;
+                        pdev->resource[1]->end = (stk->is_kme) ? 2 : 1;
-                        if (pcmcia_request_io(pdev, &pdev->io) != 0)
+                        if (pcmcia_request_io(pdev) != 0)
                                return -ENODEV;
-                        stk->ctl_base = pdev->io.BasePort2;
+                        stk->ctl_base = pdev->resource[1]->start;
                } else if ((io->nwin == 1) && (io->win[0].len >= 16)) {
-                        pdev->io.NumPorts1 = io->win[0].len;
+                        pdev->resource[0]->end = io->win[0].len;
-                        pdev->io.NumPorts2 = 0;
+                        pdev->resource[1]->end = 0;
-                        if (pcmcia_request_io(pdev, &pdev->io) != 0)
+                        if (pcmcia_request_io(pdev) != 0)
                                return -ENODEV;
-                        stk->ctl_base = pdev->io.BasePort1 + 0x0e;
+                        stk->ctl_base = pdev->resource[0]->start + 0x0e;
                } else
                        return -ENODEV;
                /* If we've got this far, we're done */
@@ -280,7 +281,7 @@ static int ide_config(struct pcmcia_device *link)
            if (pcmcia_loop_config(link, pcmcia_check_one_config, stk))
                    goto failed; /* No suitable config found */
    }
-    io_base = link->io.BasePort1;
+    io_base = link->resource[0]->start;
    ctl_base = stk->ctl_base;
    if (!link->irq)
@@ -297,7 +298,7 @@ static int ide_config(struct pcmcia_device *link)
        outb(0x81, ctl_base+1);
     host = idecs_register(io_base, ctl_base, link->irq, link);
-     if (host == NULL && link->io.NumPorts1 == 0x20) {
+     if (host == NULL && resource_size(link->resource[0]) == 0x20) {
            outb(0x02, ctl_base + 0x10);
            host = idecs_register(io_base + 0x10, ctl_base + 0x10,
                                  link->irq, link);
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c
index 137337a795a9..70aeeb18833e 100644
--- a/drivers/ide/ide-gd.c
+++ b/drivers/ide/ide-gd.c
@@ -93,7 +93,7 @@ static void ide_disk_release(struct device *dev)
 /*
 * On HPA drives the capacity needs to be
- * reinitilized on resume otherwise the disk
+ * reinitialized on resume otherwise the disk
 * can not be used and a hard reset is required
 */
 static void ide_gd_resume(ide_drive_t *drive)
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 67fb73559fd5..34b9872f35d1 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -480,13 +480,9 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)
        u16 nsect               = 0;
        char __user *buf = (char __user *)arg;
-        req_task = kzalloc(tasksize, GFP_KERNEL);
+        req_task = memdup_user(buf, tasksize);
-        if (req_task == NULL)
+        if (IS_ERR(req_task))
-                return -ENOMEM;
+                return PTR_ERR(req_task);
-        if (copy_from_user(req_task, buf, tasksize)) {
-                kfree(req_task);
-                return -EFAULT;
-        }
        taskout = req_task->out_size;
        taskin  = req_task->in_size;
diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c
index 1d80f1fdbc97..7002765b593c 100644
--- a/drivers/ide/tx4938ide.c
+++ b/drivers/ide/tx4938ide.c
@@ -64,7 +64,7 @@ static void tx4938ide_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
        pair = ide_get_pair_dev(drive);
        if (pair)
-                safe = min(safe, pair->pio_mode - XFER_PIO_0);
+                safe = min_t(u8, safe, pair->pio_mode - XFER_PIO_0);
        tx4938ide_tune_ebusc(pdata->ebus_ch, pdata->gbus_clock, safe);
 }
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index 3c7367751873..bed3e39aac96 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -114,7 +114,7 @@ static void tx4939ide_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
        pair = ide_get_pair_dev(drive);
        if (pair)
-                safe = min(safe, pair->pio_mode - XFER_PIO_0);
+                safe = min_t(u8, safe, pair->pio_mode - XFER_PIO_0);
        /*
         * Update Command Transfer Mode for master/slave and Data
         * Transfer Mode for this drive.
diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
index 101f40022386..d2a0997b78f8 100644
--- a/drivers/ide/via82cxxx.c
+++ b/drivers/ide/via82cxxx.c
@@ -79,7 +79,7 @@ static struct via_isa_bridge {
        { "vt8261",     PCI_DEVICE_ID_VIA_8261,     0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
        { "vt8237s",    PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
        { "vt6410",     PCI_DEVICE_ID_VIA_6410,     0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
-        { "vt6415",     PCI_DEVICE_ID_VIA_6410,     0x00, 0xff, ATA_UDMA6, VIA_BAD_AST },
+        { "vt6415",     PCI_DEVICE_ID_VIA_6415,     0x00, 0xff, ATA_UDMA6, VIA_BAD_AST },
        { "vt8251",     PCI_DEVICE_ID_VIA_8251,     0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
        { "vt8237",     PCI_DEVICE_ID_VIA_8237,     0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
        { "vt8237a",    PCI_DEVICE_ID_VIA_8237A,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },