Commit a8a84540 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ffece480 28c1969f

drivers/ide/ide-ioctls.c

+1 −1
Original line number Diff line number Diff line
@@ -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;