From 4aa16b59d6eb99e8bda163c408ac470f98813976 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 25 May 2007 20:50:24 +0100 Subject: [PATCH] --- yaml --- r: 59069 b: refs/heads/master c: 15ce09432a4399e61b57f2ceb564522d6534c15f h: refs/heads/master i: 59067: 2aad508205d6ad9f0854b0836482c9a51fe4c422 v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_sis.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c148d415318c..85d14f1984ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45a66c1c3ff88e8050dd25e81bafdf79a12a8042 +refs/heads/master: 15ce09432a4399e61b57f2ceb564522d6534c15f diff --git a/trunk/drivers/ata/pata_sis.c b/trunk/drivers/ata/pata_sis.c index 2b4508206a6c..657b1ee2f5c1 100644 --- a/trunk/drivers/ata/pata_sis.c +++ b/trunk/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); }