1 files changed, 15 insertions, 7 deletions

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index e17a9ee120ea..bb9693dabe41 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -303,9 +303,6 @@ void default_hwif_transport(ide_hwif_t *hwif)
         hwif->atapi_output_bytes        = atapi_output_bytes;
 }
 
-/*
- * Beginning of Taskfile OPCODE Library and feature sets.
- */
 void ide_fix_driveid (struct hd_driveid *id)
 {
 #ifndef __LITTLE_ENDIAN
@@ -592,6 +589,9 @@ EXPORT_SYMBOL_GPL(ide_in_drive_list);
 static const struct drive_list_entry ivb_list[] = {
         { "QUANTUM FIREBALLlct10 05"    , "A03.0900"    },
         { "TSSTcorp CDDVDW SH-S202J"    , "SB00"        },
+        { "TSSTcorp CDDVDW SH-S202J"    , "SB01"        },
+        { "TSSTcorp CDDVDW SH-S202N"    , "SB00"        },
+        { "TSSTcorp CDDVDW SH-S202N"    , "SB01"        },
         { NULL                          , NULL          }
 };
 
@@ -612,12 +612,12 @@ u8 eighty_ninty_three (ide_drive_t *drive)
                 printk(KERN_DEBUG "%s: skipping word 93 validity check\n",
                                   drive->name);
 
+        if (ide_dev_is_sata(id) && !ivb)
+                return 1;
+
         if (hwif->cbl != ATA_CBL_PATA80 && !ivb)
                 goto no_80w;
 
-        if (ide_dev_is_sata(id))
-                return 1;
-
         /*
          * FIXME:
          * - force bit13 (80c cable present) check also for !ivb devices
@@ -748,6 +748,9 @@ int ide_driveid_update(ide_drive_t *drive)
                 drive->id->dma_1word = id->dma_1word;
                 /* anything more ? */
                 kfree(id);
+
+                if (drive->using_dma && ide_id_dma_bug(drive))
+                        ide_dma_off(drive);
         }
 
         return 1;
@@ -756,7 +759,7 @@ int ide_driveid_update(ide_drive_t *drive)
 int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
 {
         ide_hwif_t *hwif = drive->hwif;
-        int error;
+        int error = 0;
         u8 stat;
 
 //      while (HWGROUP(drive)->busy)
@@ -767,6 +770,10 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
                 hwif->dma_host_off(drive);
 #endif
 
+        /* Skip setting PIO flow-control modes on pre-EIDE drives */
+        if ((speed & 0xf8) == XFER_PIO_0 && !(drive->id->capability & 0x08))
+                goto skip;
+
         /*
          * Don't use ide_wait_cmd here - it will
          * attempt to set_geometry and recalibrate,
@@ -814,6 +821,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
         drive->id->dma_mword &= ~0x0F00;
         drive->id->dma_1word &= ~0x0F00;
 
+ skip:
 #ifdef CONFIG_BLK_DEV_IDEDMA
         if (speed >= XFER_SW_DMA_0)
                 hwif->dma_host_on(drive);