d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct the last commit, only look for subfunctions on the same PCI slot.

Browse Source
This commit is contained in:
Søren Schmidt 2003-03-12 15:45:52 +00:00
parent b2a0f525e6
commit deff57d72c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=112151
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/ata/ata-chipset.c
View File

@ -1811,13 +1811,14 @@ static int
ata_find_dev(device_t dev, u_int32_t devid, u_int32_t revid) ata_find_dev(device_t dev, u_int32_t devid, u_int32_t revid)
{ {
device_t *children; device_t *children;
int nchildren, i; int nchildren, i, slot = pci_get_slot(dev);
if (device_get_children(device_get_parent(dev), &children, &nchildren)) if (device_get_children(device_get_parent(dev), &children, &nchildren))
return 0; return 0;
for (i = 0; i < nchildren; i++) { for (i = 0; i < nchildren; i++) {
if (pci_get_devid(children[i]) == devid && if (pci_get_slot(children[i]) == slot &&
pci_get_devid(children[i]) == devid &&
pci_get_revid(children[i]) >= revid) { pci_get_revid(children[i]) >= revid) {
free(children, M_TEMP); free(children, M_TEMP);
return 1; return 1;
@ -1831,8 +1832,7 @@ static struct ata_chip_id *
ata_match_chip(device_t dev, struct ata_chip_id *index) ata_match_chip(device_t dev, struct ata_chip_id *index)
{ {
while (index->chiptype != 0) { while (index->chiptype != 0) {
if (pci_get_devid(dev) == index->chiptype && if (ata_find_dev(dev, index->chiptype, index->chiprev))
pci_get_revid(dev) >= index->chiprev)
return index; return index;
index++; index++;
} }