diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 17:02:34 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 17:02:34 -0500 |
| commit | a8a84540eb3fd0493f250dc1c513bef6810a50fd (patch) | |
| tree | a5dc868177093b677ab50fa8aabc21c86cd65011 /drivers/ide | |
| parent | ffece4808d253131e910a0e0afada82f60b1980a (diff) | |
| parent | 28c1969ff887bc2a7df39272850dece01de03285 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
ide: fix ioctl to pass requested transfer mode to ide_find_dma_mode instead of UDMA6
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-ioctls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-ioctls.c b/drivers/ide/ide-ioctls.c index d3440b5010a5..6e7ae2b6cfc6 100644 --- a/drivers/ide/ide-ioctls.c +++ b/drivers/ide/ide-ioctls.c | |||
| @@ -162,7 +162,7 @@ static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg) | |||
| 162 | if (tf->command == ATA_CMD_SET_FEATURES && | 162 | if (tf->command == ATA_CMD_SET_FEATURES && |
| 163 | tf->feature == SETFEATURES_XFER && | 163 | tf->feature == SETFEATURES_XFER && |
| 164 | tf->nsect >= XFER_SW_DMA_0) { | 164 | tf->nsect >= XFER_SW_DMA_0) { |
| 165 | xfer_rate = ide_find_dma_mode(drive, XFER_UDMA_6); | 165 | xfer_rate = ide_find_dma_mode(drive, tf->nsect); |
| 166 | if (xfer_rate != tf->nsect) { | 166 | if (xfer_rate != tf->nsect) { |
| 167 | err = -EINVAL; | 167 | err = -EINVAL; |
| 168 | goto abort; | 168 | goto abort; |