diff options
| author | Uwe Stuehler <uwe@cvs.openbsd.org> | 2006-06-03 03:01:50 +0000 |
|---|---|---|
| committer | Uwe Stuehler <uwe@cvs.openbsd.org> | 2006-06-03 03:01:50 +0000 |
| commit | 1e47cce57fcded2bc6ef4b40140b440973415d31 (patch) | |
| tree | 35f39562c0a882fb58b4f39ff5ed6bad84b74c22 /sys/dev | |
| parent | dc6c763056c86017636eaf1e517e04bc4021028a (diff) | |
- only call config_found for function number > 0
- always display the product information in sdmmc_print()
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/sdmmc/sdmmc_io.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sys/dev/sdmmc/sdmmc_io.c b/sys/dev/sdmmc/sdmmc_io.c index f811eb0e7e3..6fdc42c73cb 100644 --- a/sys/dev/sdmmc/sdmmc_io.c +++ b/sys/dev/sdmmc/sdmmc_io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sdmmc_io.c,v 1.3 2006/06/01 21:53:41 uwe Exp $ */ +/* $OpenBSD: sdmmc_io.c,v 1.4 2006/06/03 03:01:49 uwe Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -204,6 +204,9 @@ sdmmc_io_attach(struct sdmmc_softc *sc) struct sdmmc_attach_args saa; SIMPLEQ_FOREACH(sf, &sc->sf_head, sf_list) { + if (sf->number < 1) + continue; + bzero(&saa, sizeof saa); saa.sf = sf; @@ -256,6 +259,13 @@ sdmmc_print(void *aux, const char *pnp) printf("%sat %s", i ? " " : "", pnp); } printf(" function %d", sf->number); + + if (!pnp) { + for (i = 0; i < 3 && cis->cis1_info[i]; i++) + printf("%s%s", i ? ", " : " \"", cis->cis1_info[i]); + if (i != 0) + printf("\""); + } return UNCONF; } |