diff options
| author | Russell King | 2009-12-04 15:59:47 +0100 |
|---|---|---|
| committer | Russell King | 2009-12-04 15:59:47 +0100 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /drivers/ide/ide-ioctls.c | |
| parent | ARM: 5846/1: MAINTAINERS: Add arm Nomadik support (diff) | |
| parent | ARM: I-cache: flush executable mappings in flush_cache_range() (diff) | |
| download | kernel-qcow2-linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.tar.gz kernel-qcow2-linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.tar.xz kernel-qcow2-linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.zip | |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'drivers/ide/ide-ioctls.c')
| -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) if (tf->command == ATA_CMD_SET_FEATURES && tf->feature == SETFEATURES_XFER && tf->nsect >= XFER_SW_DMA_0) { - xfer_rate = ide_find_dma_mode(drive, XFER_UDMA_6); + xfer_rate = ide_find_dma_mode(drive, tf->nsect); if (xfer_rate != tf->nsect) { err = -EINVAL; goto abort; |