Patchwork [git] libata fix

login
register
mail settings
Submitter Jeff Garzik
Date March 29, 2010, 8:22 p.m.
Message ID <20100329202220.GA14437@havoc.gtf.org>
Download mbox | patch
Permalink /patch/48903/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Jeff Garzik - March 29, 2010, 8:22 p.m.
Please pull from 'upstream-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus

to receive the following updates:

 drivers/ata/pata_via.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

JosephChan@via.com.tw (1):
      pata_via: fix VT6410/6415/6330 detection issue

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 95d39c3..c59b407 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -576,6 +576,10 @@  static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 			u8 rev = isa->revision;
 			pci_dev_put(isa);
 
+			if ((id->device == 0x0415 || id->device == 0x3164) &&
+			    (config->id != id->device))
+				continue;
+
 			if (rev >= config->rev_min && rev <= config->rev_max)
 				break;
 		}