diff options
| author | pgoyette <pgoyette@NetBSD.org> | 2012-03-14 02:57:10 +0000 |
|---|---|---|
| committer | pgoyette <pgoyette@NetBSD.org> | 2012-03-14 02:57:10 +0000 |
| commit | ee8280246c4aaca941ca32cba8b08bd3bf12aa83 (patch) | |
| tree | 1f8957189f49adc6a2d50065ee567f29e8a98a27 /sys/dev/i2c | |
| parent | 17f7ffb9f914614049ff90d4b025a3ec8a3d093f (diff) | |
Don't try to match a device if there's already a device attached at
the specified address.
Diffstat (limited to 'sys/dev/i2c')
| -rw-r--r-- | sys/dev/i2c/i2c.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/i2c/i2c.c b/sys/dev/i2c/i2c.c index 5dc7f34577a..83e785123d5 100644 --- a/sys/dev/i2c/i2c.c +++ b/sys/dev/i2c/i2c.c @@ -1,4 +1,4 @@ -/* $NetBSD: i2c.c,v 1.37 2011/10/11 15:19:09 macallan Exp $ */ +/* $NetBSD: i2c.c,v 1.38 2012/03/14 02:57:10 pgoyette Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.37 2011/10/11 15:19:09 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.38 2012/03/14 02:57:10 pgoyette Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -118,10 +118,10 @@ iic_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux) ia.ia_ncompat = 0; ia.ia_compat = NULL; - if (config_match(parent, cf, &ia) > 0) { - if (ia.ia_addr != (i2c_addr_t)-1 && - ia.ia_addr <= I2C_MAX_ADDR && - !sc->sc_devices[ia.ia_addr]) + if (ia.ia_addr != (i2c_addr_t)-1 && + ia.ia_addr <= I2C_MAX_ADDR && + !sc->sc_devices[ia.ia_addr]) + if (config_match(parent, cf, &ia) > 0) { sc->sc_devices[ia.ia_addr] = config_attach(parent, cf, &ia, iic_print); } |
