summaryrefslogtreecommitdiffstats
path: root/sys/dev/sdmmc
diff options
context:
space:
mode:
authorblambert <blambert@openbsd.org>2010-07-02 02:40:15 +0000
committerblambert <blambert@openbsd.org>2010-07-02 02:40:15 +0000
commit41b18b7efaec5eccb1adb3e63aeb9377f4c90ebf (patch)
tree302d91ce246e0922e434bf95ecec888dab2647f8 /sys/dev/sdmmc
parentbraces define scope, not indentation. found hunting uninit bugs. ok oga (diff)
downloadwireguard-openbsd-41b18b7efaec5eccb1adb3e63aeb9377f4c90ebf.tar.xz
wireguard-openbsd-41b18b7efaec5eccb1adb3e63aeb9377f4c90ebf.zip
m_copyback can fail to allocate memory, but is a void fucntion so gymnastics
are required to detect that. Change the function to take a wait argument (used in nfs server, but M_NOWAIT everywhere else for now) and to return an error ok claudio@ henning@ krw@
Diffstat (limited to 'sys/dev/sdmmc')
-rw-r--r--sys/dev/sdmmc/sbt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/sdmmc/sbt.c b/sys/dev/sdmmc/sbt.c
index a04623d14bf..b66b6023610 100644
--- a/sys/dev/sdmmc/sbt.c
+++ b/sys/dev/sdmmc/sbt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbt.c,v 1.14 2010/02/11 10:12:19 claudio Exp $ */
+/* $OpenBSD: sbt.c,v 1.15 2010/07/02 02:40:16 blambert Exp $ */
/*
* Copyright (c) 2007 Uwe Stuehler <uwe@openbsd.org>
@@ -372,7 +372,7 @@ sbt_intr(void *arg)
}
m->m_pkthdr.len = m->m_len = MHLEN;
- m_copyback(m, 0, len, sc->sc_buf);
+ m_copyback(m, 0, len, sc->sc_buf, M_NOWAIT);
if (m->m_pkthdr.len == MAX(MHLEN, len)) {
m->m_pkthdr.len = len;
m->m_len = MIN(MHLEN, m->m_pkthdr.len);