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

Commit 987d2f05 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[PATCH] libata: make reset methods complain when they fail 



Make reset methods complain loud when they fail.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 2bf2cb26

drivers/scsi/libata-core.c

+5 −3
Original line number Diff line number Diff line
@@ -2232,8 +2232,10 @@ static unsigned int ata_bus_softreset(struct ata_port *ap, 
	 * the bus shows 0xFF because the odd clown forgets the D7

	 * pulldown resistor.

	 */

	if (ata_check_status(ap) == 0xFF)

	if (ata_check_status(ap) == 0xFF) {

		printk(KERN_ERR "ata%u: SRST failed (status 0xFF)\n", ap->id);

		return AC_ERR_OTHER;

	}



	ata_bus_post_reset(ap, devmask);
@@ -2494,8 +2496,8 @@ int sata_std_hardreset(struct ata_port *ap, unsigned int *class) 
	}



	if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {

		printk(KERN_ERR "ata%u: COMRESET failed "

		       "(device not ready)\n", ap->id);

		printk(KERN_ERR

		       "ata%u: COMRESET failed (device not ready)\n", ap->id);

		return -EIO;

	}

drivers/scsi/sata_sil24.c

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ static int sil24_softreset(struct ata_port *ap, unsigned int *class) 
	writel(irq_enable, port + PORT_IRQ_ENABLE_SET);



	if (!(irq_stat & PORT_IRQ_COMPLETE)) {

		DPRINTK("EXIT, srst failed\n");

		printk(KERN_ERR "ata%u: softreset failed (timeout)\n", ap->id);

		return -EIO;

	}