Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 603a0e2c authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

amd74xx: resume fix 



* Driver can't skip programming transfer mode on the device in amd_set_drive()
  (similar fix has been applied to via82cxxx driver ages ago).

* While at it remove redundant warning (ide_config_drive_speed() already
  produces more valuable one).

* Bump driver version.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 96dcc08b

drivers/ide/pci/amd74xx.c

+3 −5
Original line number Diff line number Diff line 
/*

 * Version 2.15

 * Version 2.16

 *

 * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04

 * IDE driver for Linux.
@@ -244,10 +244,8 @@ static int amd_set_drive(ide_drive_t *drive, u8 speed) 
	struct ide_timing t, p;

	int T, UT;



	if (speed != XFER_PIO_SLOW && speed != drive->current_speed)

		if (ide_config_drive_speed(drive, speed))

			printk(KERN_WARNING "ide%d: Drive %d didn't accept speed setting. Oh, well.\n",

				drive->dn >> 1, drive->dn & 1);

	if (speed != XFER_PIO_SLOW)

		ide_config_drive_speed(drive, speed);



	T = 1000000000 / amd_clock;

	UT = T / min_t(int, max_t(int, amd_config->flags & AMD_UDMA, 1), 2);