diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-29 14:41:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-29 14:41:48 -0700 |
| commit | 7b12887244293eb54acd07c6296b830b3af0f6da (patch) | |
| tree | 7af1b624b3248d5a9e38c787f998dc63738b85ab /drivers | |
| parent | 6631424fd2efd75e7394b318ad2a8597327857a9 (diff) | |
| parent | bc8a67386fd462914269fa93446e1891955a8bb3 (diff) | |
| download | linux-3.10-7b12887244293eb54acd07c6296b830b3af0f6da.tar.gz linux-3.10-7b12887244293eb54acd07c6296b830b3af0f6da.tar.bz2 linux-3.10-7b12887244293eb54acd07c6296b830b3af0f6da.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_via: fix VT6410/6415/6330 detection issue
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ata/pata_via.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c index 95d39c36ace..c59b40710fb 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; } |