Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert previous. Indirect matches are not wanted on platforms that 

use external configuration data (FDT or OF).
This commit is contained in:
mlelstv 2019-12-05 06:28:09 +00:00
parent f30d729901
commit df76ad14d5
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/i2c/i2c.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: i2c.c,v 1.69 2019/03/26 09:20:38 mlelstv Exp $ */
/* $NetBSD: i2c.c,v 1.70 2019/12/05 06:28:09 mlelstv Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@ -40,7 +40,7 @@
#endif
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.69 2019/03/26 09:20:38 mlelstv Exp $");
__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.70 2019/12/05 06:28:09 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -719,8 +719,6 @@ iic_use_direct_match(const struct i2c_attach_args *ia, const cfdata_t cf,
const struct device_compatible_entry *compats,
int *match_resultp)
{
int res;
KASSERT(match_resultp != NULL);
if (ia->ia_name != NULL &&
@ -730,11 +728,8 @@ iic_use_direct_match(const struct i2c_attach_args *ia, const cfdata_t cf,
}
if (ia->ia_ncompat > 0 && ia->ia_compat != NULL) {
res = iic_compatible_match(ia, compats, NULL);
if (res) {
*match_resultp = res;
return true;
}
*match_resultp = iic_compatible_match(ia, compats, NULL);
return true;
}
return false;