diff options
| author | Takanori Watanabe <takawata@FreeBSD.org> | 2018-10-26 00:05:46 +0000 |
|---|---|---|
| committer | Takanori Watanabe <takawata@FreeBSD.org> | 2018-10-26 00:05:46 +0000 |
| commit | 5efca36fbda65afe7726d685dcc43a707ef76447 (patch) | |
| tree | 582c853f814a4acc5c72bf510ec4ba7b180e75c3 /sys/dev/asmc | |
| parent | fef4815e9af171e64f6156bf7b97bb7424b8a22b (diff) | |
| download | src-5efca36fbda65afe7726d685dcc43a707ef76447.tar.gz src-5efca36fbda65afe7726d685dcc43a707ef76447.zip | |
Distinguish _CID match and _HID match and make lower priority probe
when _CID match.
Reviewed by: jhb, imp
Differential Revision:https://reviews.freebsd.org/D16468
Notes
Notes:
svn path=/head/; revision=339754
Diffstat (limited to 'sys/dev/asmc')
| -rw-r--r-- | sys/dev/asmc/asmc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 88e485fdeb97..8f657ac1972b 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -374,11 +374,13 @@ static int asmc_probe(device_t dev) { struct asmc_model *model; + int rv; if (resource_disabled("asmc", 0)) return (ENXIO); - if (ACPI_ID_PROBE(device_get_parent(dev), dev, asmc_ids) == NULL) - return (ENXIO); + rv = ACPI_ID_PROBE(device_get_parent(dev), dev, asmc_ids, NULL); + if (rv > 0) + return (rv); model = asmc_match(dev); if (!model) { @@ -387,7 +389,7 @@ asmc_probe(device_t dev) } device_set_desc(dev, model->smc_desc); - return (BUS_PROBE_DEFAULT); + return (rv); } static int |