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

Commit 326d72f4 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

cs5520: don't enable VDMA in ->speedproc 



There is no need to do it in cs5520_tune_chipset() (->speedproc method)
since it is correctly handled by cs5520_dma_on() (->ide_dma_on method).

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent fabe1510

drivers/ide/pci/cs5520.c

+4 −9
Original line number Original line Diff line number Diff line
@@ -73,7 +73,6 @@ static int cs5520_tune_chipset(ide_drive_t *drive, const u8 speed) 
	int pio = speed;

	int pio = speed;

	u8 reg;

	u8 reg;

	int controller = drive->dn > 1 ? 1 : 0;

	int controller = drive->dn > 1 ? 1 : 0;

	int error;





	switch(speed)

	switch(speed)

	{

	{
@@ -115,12 +114,7 @@ static int cs5520_tune_chipset(ide_drive_t *drive, const u8 speed) 
	reg |= 1<<((drive->dn&1)+5);

	reg |= 1<<((drive->dn&1)+5);

	outb(reg, hwif->dma_base + 0x02 + 8*controller);

	outb(reg, hwif->dma_base + 0x02 + 8*controller);





	error = ide_config_drive_speed(drive, speed);

	return ide_config_drive_speed(drive, speed);

	/* ATAPI is harder so leave it for now */

	if(!error && drive->media == ide_disk)

		error = hwif->ide_dma_on(drive);



	return error;

}

}





static void cs5520_set_pio_mode(ide_drive_t *drive, const u8 pio)

static void cs5520_set_pio_mode(ide_drive_t *drive, const u8 pio)
@@ -178,6 +172,7 @@ static void __devinit init_hwif_cs5520(ide_hwif_t *hwif) 
		return;

		return;

	}

	}





	/* ATAPI is harder so leave it for now */

	hwif->atapi_dma = 0;

	hwif->atapi_dma = 0;

	hwif->ultra_mask = 0;

	hwif->ultra_mask = 0;

	hwif->swdma_mask = 0;

	hwif->swdma_mask = 0;