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

Commit ce2d3abc authored by Mikael Pettersson's avatar Mikael Pettersson Committed by Jeff Garzik
Browse files

sata_promise: fix error decode regression 



Promise ATA ports should always be reset by pdc_reset_port()
when errors are detected, but the recent error reason decoding
update to sata_promise replaced that reset with a freeze.

This patch changes the error detection to do a reset again.
This makes the error decoding update safer, as it now only
adds error decoding without changing any other behaviour.

Signed-off-by: default avatarMikael Pettersson <mikpe@it.uu.se>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 9bedb799

drivers/ata/sata_promise.c

+6 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
#include "sata_promise.h"



#define DRV_NAME	"sata_promise"

#define DRV_VERSION	"2.04"

#define DRV_VERSION	"2.05"





enum {
@@ -650,9 +650,12 @@ static void pdc_error_intr(struct ata_port *ap, struct ata_queued_cmd *qc, 
			   | PDC_PCI_SYS_ERR | PDC1_PCI_PARITY_ERR))

		ac_err_mask |= AC_ERR_HOST_BUS;



	ehi->action |= ATA_EH_SOFTRESET;

	if (sata_scr_valid(ap))

		ehi->serror |= pdc_sata_scr_read(ap, SCR_ERROR);



	qc->err_mask |= ac_err_mask;

	ata_port_freeze(ap);



	pdc_reset_port(ap);

}



static inline unsigned int pdc_host_intr( struct ata_port *ap,