From: Alan Cox Date: Fri, 25 May 2007 19:50:24 +0000 (+0100) Subject: pata_sis: FIFO whack X-Git-Tag: v2.6.23-rc1~1108^2~19 X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=15ce09432a4399e61b57f2ceb564522d6534c15f;p=powerpc.git pata_sis: FIFO whack If you are using a SiS controller and the BIOS didn't set it up then the FIFO may be left active when we try and set up the CD. Not convinced this matters but I'd prefer to be safe Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik --- diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index 2b4508206a..657b1ee2f5 100644 --- a/drivers/ata/pata_sis.c +++ b/drivers/ata/pata_sis.c @@ -149,6 +149,9 @@ static int sis_pre_reset(struct ata_port *ap, unsigned long deadline) if (!pci_test_config_bits(pdev, &sis_enable_bits[ap->port_no])) return -ENOENT; + /* Clear the FIFO settings. We can't enable the FIFO until + we know we are poking at a disk */ + pci_write_config_byte(pdev, 0x4B, 0); return ata_std_prereset(ap, deadline); }