Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/sdmmc if poll card detect is enabled, don't show "co...



details:   https://anonhg.NetBSD.org/src/rev/36a7a1608fa9
branches:  trunk
changeset: 763443:36a7a1608fa9
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Sun Mar 20 03:02:48 2011 +0000

description:
if poll card detect is enabled, don't show "couldn't enable card".

diffstat:

 sys/dev/sdmmc/sdmmc.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r f7da00713549 -r 36a7a1608fa9 sys/dev/sdmmc/sdmmc.c
--- a/sys/dev/sdmmc/sdmmc.c     Sun Mar 20 03:00:56 2011 +0000
+++ b/sys/dev/sdmmc/sdmmc.c     Sun Mar 20 03:02:48 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdmmc.c,v 1.8 2011/02/13 06:43:51 nonaka Exp $ */
+/*     $NetBSD: sdmmc.c,v 1.9 2011/03/20 03:02:48 nonaka Exp $ */
 /*     $OpenBSD: sdmmc.c,v 1.18 2009/01/09 10:58:38 jsg Exp $  */
 
 /*
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc.c,v 1.8 2011/02/13 06:43:51 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc.c,v 1.9 2011/03/20 03:02:48 nonaka Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -346,7 +346,9 @@
         */
        error = sdmmc_enable(sc);
        if (error) {
-               aprint_error_dev(sc->sc_dev, "couldn't enable card\n");
+               if (!ISSET(sc->sc_caps, SMC_CAPS_POLL_CARD_DET)) {
+                       aprint_error_dev(sc->sc_dev, "couldn't enable card\n");
+               }
                goto err;
        }
 



Home | Main Index | Thread Index | Old Index