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

Commit b6966a61 authored by Martin K. Petersen's avatar Martin K. Petersen Committed by Jeff Garzik
Browse files

pata_cs5536.c bugfix 



Fix speed negotiation for secondary device.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 7a3a16fe

drivers/ata/pata_cs5536.c

+4 −4
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <asm/msr.h>



#define DRV_NAME	"pata_cs5536"

#define DRV_VERSION	"0.0.6"

#define DRV_VERSION	"0.0.7"



enum {

	CFG			= 0,
@@ -153,8 +153,8 @@ static void cs5536_set_piomode(struct ata_port *ap, struct ata_device *adev) 
	struct ata_device *pair = ata_dev_pair(adev);

	int mode = adev->pio_mode - XFER_PIO_0;

	int cmdmode = mode;

	int dshift = ap->port_no ? IDE_D1_SHIFT : IDE_D0_SHIFT;

	int cshift = ap->port_no ? IDE_CAST_D1_SHIFT : IDE_CAST_D0_SHIFT;

	int dshift = adev->devno ? IDE_D1_SHIFT : IDE_D0_SHIFT;

	int cshift = adev->devno ? IDE_CAST_D1_SHIFT : IDE_CAST_D0_SHIFT;

	u32 dtc, cast, etc;



	if (pair)
@@ -201,7 +201,7 @@ static void cs5536_set_dmamode(struct ata_port *ap, struct ata_device *adev) 
	struct pci_dev *pdev = to_pci_dev(ap->host->dev);

	u32 dtc, etc;

	int mode = adev->dma_mode;

	int dshift = ap->port_no ? IDE_D1_SHIFT : IDE_D0_SHIFT;

	int dshift = adev->devno ? IDE_D1_SHIFT : IDE_D0_SHIFT;



	if (mode >= XFER_UDMA_0) {

		cs5536_read(pdev, ETC, &etc);