Commit 5dfb8498 authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Damien Le Moal
Browse files

pata_hpt3x2n: fix writing to wrong register in hpt3x2n_bmdma_stop() 



The driver's bmdma_stop() method writes to the wrong PCI config register
(0x52 intead of 0x54) when trying to clear the state machine on secondary
channel -- "luckily", the write falls on a read-only part of the primary
channel MISC. control 3 register, so no collateral damage is done...

Alan Cox fixed the HPT37x driver in commit 6929da44 ("[PATCH] hpt37x:
Two important bug fixes") but forgot to check the HPT3x2N driver which has
the same bug. :-/

Signed-off-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent a565ed1b

drivers/ata/pata_hpt3x2n.c

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/libata.h>



#define DRV_NAME	"pata_hpt3x2n"

#define DRV_VERSION	"0.3.16"

#define DRV_VERSION	"0.3.17"



enum {

	HPT_PCI_FAST	=	(1 << 31),
@@ -251,7 +251,7 @@ static void hpt3x2n_bmdma_stop(struct ata_queued_cmd *qc) 
{

	struct ata_port *ap = qc->ap;

	struct pci_dev *pdev = to_pci_dev(ap->host->dev);

	int mscreg = 0x50 + 2 * ap->port_no;

	int mscreg = 0x50 + 4 * ap->port_no;

	u8 bwsr_stat, msc_stat;



	pci_read_config_byte(pdev, 0x6A, &bwsr_stat);