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

Commit 9ce41aed authored by David S. Miller's avatar David S. Miller
Browse files

Revert "ide: skip probe if there are no devices on the port (v2)" 



This reverts commit a20b2a44.

As requested by David Fries.  This makes CDROMs which are slave drives
on a ribbon without a master disappear and causes other similar kinds
of badness.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e4afb29f

drivers/ide/ide-probe.c

+3 −9
Original line number Diff line number Diff line
@@ -695,14 +695,8 @@ static int ide_probe_port(ide_hwif_t *hwif) 
	if (irqd)

		disable_irq(hwif->irq);



	rc = ide_port_wait_ready(hwif);

	if (rc == -ENODEV) {

		printk(KERN_INFO "%s: no devices on the port\n", hwif->name);

		goto out;

	} else if (rc == -EBUSY)

		printk(KERN_ERR "%s: not ready before the probe\n", hwif->name);

	else

		rc = -ENODEV;

	if (ide_port_wait_ready(hwif) == -EBUSY)

		printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);



	/*

	 * Second drive should only exist if first drive was found,
@@ -713,7 +707,7 @@ static int ide_probe_port(ide_hwif_t *hwif) 
		if (drive->dev_flags & IDE_DFLAG_PRESENT)

			rc = 0;

	}

out:



	/*

	 * Use cached IRQ number. It might be (and is...) changed by probe

	 * code above