diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-09 17:17:57 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-09 17:17:57 -0400 |
commit | 15a4f943e729d8ba215ee551df6d7988ba14ac00 (patch) | |
tree | 16c115fc64919b905f928066d354a4008b231356 | |
parent | ecea57309e826c8aed020e4dae92b368f2eda2a5 (diff) |
ide: fix pre-EIDE SWDMA support
If the word 62 is not defined use the word 52 to get SWDMA mask
in ide_get_mode_mask().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r-- | drivers/ide/ide-dma.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 85db8e85443a..e8c6e1ed497a 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
@@ -702,8 +702,22 @@ static unsigned int ide_get_mode_mask(ide_drive_t *drive, u8 base) | |||
702 | mask = id->dma_mword & hwif->mwdma_mask; | 702 | mask = id->dma_mword & hwif->mwdma_mask; |
703 | break; | 703 | break; |
704 | case XFER_SW_DMA_0: | 704 | case XFER_SW_DMA_0: |
705 | if (id->field_valid & 2) | 705 | if (id->field_valid & 2) { |
706 | mask = id->dma_1word & hwif->swdma_mask; | 706 | mask = id->dma_1word & hwif->swdma_mask; |
707 | } else if (id->tDMA) { | ||
708 | /* | ||
709 | * ide_fix_driveid() doesn't convert ->tDMA to the | ||
710 | * CPU endianness so we need to do it here | ||
711 | */ | ||
712 | u8 mode = le16_to_cpu(id->tDMA); | ||
713 | |||
714 | /* | ||
715 | * if the mode is valid convert it to the mask | ||
716 | * (the maximum allowed mode is XFER_SW_DMA_2) | ||
717 | */ | ||
718 | if (mode <= 2) | ||
719 | mask = ((2 << mode) - 1) & hwif->swdma_mask; | ||
720 | } | ||
707 | break; | 721 | break; |
708 | default: | 722 | default: |
709 | BUG(); | 723 | BUG(); |