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

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

[PATCH] libata: kill SError clearing in sata_std_hardreset(). 



Don't clear SError in sata_std_hardreset().  This makes hardreset act
identically to ->phy_reset register-wise.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 3a39746a

drivers/scsi/libata-core.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -2018,8 +2018,6 @@ int ata_std_softreset(struct ata_port *ap, int verbose, unsigned int *classes) 
 */

 */

int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class)

int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class)

{

{

	u32 serror;



	DPRINTK("ENTER\n");

	DPRINTK("ENTER\n");





	/* Issue phy wake/reset */

	/* Issue phy wake/reset */
@@ -2034,10 +2032,6 @@ int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class) 
	/* Bring phy back */

	/* Bring phy back */

	sata_phy_resume(ap);

	sata_phy_resume(ap);





	/* Clear SError */

	serror = scr_read(ap, SCR_ERROR);

	scr_write(ap, SCR_ERROR, serror);



	/* TODO: phy layer with polling, timeouts, etc. */

	/* TODO: phy layer with polling, timeouts, etc. */

	if (!sata_dev_present(ap)) {

	if (!sata_dev_present(ap)) {

		*class = ATA_DEV_NONE;

		*class = ATA_DEV_NONE;