Module Name: src
Committed By: kiyohara
Date: Mon Sep 20 09:42:32 UTC 2010
Modified Files:
src/sys/dev/sdmmc: sdmmc_mem.c
Log Message:
Clean up return/error in sdmem_mem_send_scr().
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/sdmmc/sdmmc_mem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sdmmc/sdmmc_mem.c
diff -u src/sys/dev/sdmmc/sdmmc_mem.c:1.8 src/sys/dev/sdmmc/sdmmc_mem.c:1.9
--- src/sys/dev/sdmmc/sdmmc_mem.c:1.8 Mon Sep 20 09:34:47 2010
+++ src/sys/dev/sdmmc/sdmmc_mem.c Mon Sep 20 09:42:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmc_mem.c,v 1.8 2010/09/20 09:34:47 kiyohara Exp $ */
+/* $NetBSD: sdmmc_mem.c,v 1.9 2010/09/20 09:42:32 kiyohara Exp $ */
/* $OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 jsg Exp $ */
/*
@@ -46,7 +46,7 @@
/* Routines for SD/MMC memory cards. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.8 2010/09/20 09:34:47 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.9 2010/09/20 09:42:32 kiyohara Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -731,10 +731,10 @@
}
DPRINTF(("%s: sdmem_mem_send_scr: error = %d\n", SDMMCDEVNAME(sc),
error));
- if (error)
- return error;
+
#ifdef SDMMC_DEBUG
- sdmmc_dump_data("SCR", scr, 8);
+ if (error == 0)
+ sdmmc_dump_data("SCR", scr, 8);
#endif
return error;
}
