diff options
| author | Bret Lambert <blambert@cvs.openbsd.org> | 2010-07-02 02:40:18 +0000 |
|---|---|---|
| committer | Bret Lambert <blambert@cvs.openbsd.org> | 2010-07-02 02:40:18 +0000 |
| commit | bfc9493d9280a5a8ab43b8df30cd772c910140ba (patch) | |
| tree | 32334a91bf10c89a8551f90fe6749d45476d9ad8 /sys/dev/sdmmc | |
| parent | 364840df3893a5f720df05ee307b996c62195a07 (diff) | |
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.c | 4 |
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); |