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

This project is archived. Its data is read-only.

Commit ad0e74d3 authored Dec 12, 2007 by Bartlomiej Zolnierkiewicz

ide: add missing checks for control register existence

Add missing checks for control register existence (some legacy m68k specific
IDE controllers don't have it). Also use drive->ctl while at it.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

parent 69ae6fee

drivers/ide/ide-io.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -970,7 +970,8 @@ static void ide_check_pm_state(ide_drive_t drive, struct request rq)
		if (rc)
		printk(KERN_WARNING "%s: bus not ready on wakeup\n", drive->name);
		SELECT_DRIVE(drive);
		HWIF(drive)->OUTB(8, HWIF(drive)->io_ports[IDE_CONTROL_OFFSET]);
		if (IDE_CONTROL_REG)
		HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG);
		rc = ide_wait_not_busy(HWIF(drive), 100000);
		if (rc)
		printk(KERN_WARNING "%s: drive not ready on wakeup\n", drive->name);

drivers/ide/ide-probe.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -667,7 +667,8 @@ static int wait_hwif_ready(ide_hwif_t *hwif)
		/* Ignore disks that we will not probe for later. */
		if (!drive->noprobe \|\| drive->present) {
		SELECT_DRIVE(drive);
		hwif->OUTB(8, hwif->io_ports[IDE_CONTROL_OFFSET]);
		if (IDE_CONTROL_REG)
		hwif->OUTB(drive->ctl, IDE_CONTROL_REG);
		mdelay(2);
		rc = ide_wait_not_busy(hwif, 35000);
		if (rc)