mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 12:42:02 +00:00
ide: don't set PIO mode on pre-EIDE drives
Fix handling of the PIO modes for the pre-EIDE drives that did not support the PIO Flow Control Transfer Mode value (00001 nnn) of the Set Transfer Mode feature by skipping the actual mode programming. Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
a1d85864d3
commit
89613e667f
@ -756,7 +756,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 +767,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 +818,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);
|
||||
|
Loading…
Reference in New Issue
Block a user