Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: save the returned value of dma_map_sg
  ide-floppy: do not map dataless cmds to an sg

4 files changed, 26 insertions, 5 deletions

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index e96c01260598..e9d042dba0e0 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -140,6 +140,12 @@ static void ide_queue_pc_head(ide_drive_t *drive, struct gendisk *disk,
         rq->cmd_flags |= REQ_PREEMPT;
         rq->buffer = (char *)pc;
         rq->rq_disk = disk;
+
+        if (pc->req_xfer) {
+                rq->data = pc->buf;
+                rq->data_len = pc->req_xfer;
+        }
+
         memcpy(rq->cmd, pc->c, 12);
         if (drive->media == ide_tape)
                 rq->cmd[13] = REQ_IDETAPE_PC1;
@@ -159,6 +165,12 @@ int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk,
         rq = blk_get_request(drive->queue, READ, __GFP_WAIT);
         rq->cmd_type = REQ_TYPE_SPECIAL;
         rq->buffer = (char *)pc;
+
+        if (pc->req_xfer) {
+                rq->data = pc->buf;
+                rq->data_len = pc->req_xfer;
+        }
+
         memcpy(rq->cmd, pc->c, 12);
         if (drive->media == ide_tape)
                 rq->cmd[13] = REQ_IDETAPE_PC1;
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 72ebab0bc755..059c90bb5ad2 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -128,6 +128,7 @@ int ide_build_sglist(ide_drive_t *drive, struct request *rq)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct scatterlist *sg = hwif->sg_table;
+        int i;
 
         ide_map_sg(drive, rq);
 
@@ -136,8 +137,13 @@ int ide_build_sglist(ide_drive_t *drive, struct request *rq)
         else
                 hwif->sg_dma_direction = DMA_TO_DEVICE;
 
-        return dma_map_sg(hwif->dev, sg, hwif->sg_nents,
-                          hwif->sg_dma_direction);
+        i = dma_map_sg(hwif->dev, sg, hwif->sg_nents, hwif->sg_dma_direction);
+        if (i) {
+                hwif->orig_sg_nents = hwif->sg_nents;
+                hwif->sg_nents = i;
+        }
+
+        return i;
 }
 EXPORT_SYMBOL_GPL(ide_build_sglist);
 
@@ -156,7 +162,7 @@ void ide_destroy_dmatable(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
 
-        dma_unmap_sg(hwif->dev, hwif->sg_table, hwif->sg_nents,
+        dma_unmap_sg(hwif->dev, hwif->sg_table, hwif->orig_sg_nents,
                      hwif->sg_dma_direction);
 }
 EXPORT_SYMBOL_GPL(ide_destroy_dmatable);
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 3eab1c6c9b31..317ec62c33d4 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -327,8 +327,10 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
                 return ide_stopped;
         }
 
-        ide_init_sg_cmd(drive, rq);
-        ide_map_sg(drive, rq);
+        if (blk_fs_request(rq) || pc->req_xfer) {
+                ide_init_sg_cmd(drive, rq);
+                ide_map_sg(drive, rq);
+        }
 
         pc->sg = hwif->sg_table;
         pc->sg_cnt = hwif->sg_nents;
diff --git a/include/linux/ide.h b/include/linux/ide.h
index e0cedfe9fad4..25087aead657 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -797,6 +797,7 @@ typedef struct hwif_s {
         struct scatterlist *sg_table;
         int sg_max_nents;               /* Maximum number of entries in it */
         int sg_nents;                   /* Current number of entries in it */
+        int orig_sg_nents;
         int sg_dma_direction;           /* dma transfer direction */
 
         /* data phase of the active command (currently only valid for PIO/DMA) */