summaryrefslogtreecommitdiff
path: root/sys/dev/sdmmc
diff options
context:
space:
mode:
authorjdolecek <jdolecek@NetBSD.org>2018-10-14 17:37:40 +0000
committerjdolecek <jdolecek@NetBSD.org>2018-10-14 17:37:40 +0000
commit1df1fda95b3fbbe5d2a49a1fcd1bfefbaeba6508 (patch)
treed3b8a07267c11ccace1f91a11ac42924d928e87e /sys/dev/sdmmc
parent27499c264f7ca51323ac65fa859a9287025ca4d4 (diff)
remove M_CANFAIL flag for malloc(9) - it was completely ignored, so had
actually no effect
Diffstat (limited to 'sys/dev/sdmmc')
-rw-r--r--sys/dev/sdmmc/sbt.c6
-rw-r--r--sys/dev/sdmmc/sdmmc_io.c9
2 files changed, 7 insertions, 8 deletions
diff --git a/sys/dev/sdmmc/sbt.c b/sys/dev/sdmmc/sbt.c
index d20f39eb5cb..0879d7c79e6 100644
--- a/sys/dev/sdmmc/sbt.c
+++ b/sys/dev/sdmmc/sbt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sbt.c,v 1.6 2018/04/18 14:56:35 maxv Exp $ */
+/* $NetBSD: sbt.c,v 1.7 2018/10/14 17:37:40 jdolecek Exp $ */
/* $OpenBSD: sbt.c,v 1.9 2007/06/19 07:59:57 uwe Exp $ */
/*
@@ -20,7 +20,7 @@
/* Driver for Type-A/B SDIO Bluetooth cards */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbt.c,v 1.6 2018/04/18 14:56:35 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbt.c,v 1.7 2018/10/14 17:37:40 jdolecek Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -182,7 +182,7 @@ sbt_attach(device_t parent, device_t self, void *aux)
/* It may be Type-B, but we use it only in Type-A mode. */
printf("%s: SDIO Bluetooth Type-A\n", DEVNAME(sc));
- sc->sc_buf = malloc(SBT_PKT_BUFSIZ, M_DEVBUF, M_NOWAIT | M_CANFAIL);
+ sc->sc_buf = malloc(SBT_PKT_BUFSIZ, M_DEVBUF, M_NOWAIT);
if (sc->sc_buf == NULL) {
aprint_error("%s: can't allocate cmd buffer\n", DEVNAME(sc));
return;
diff --git a/sys/dev/sdmmc/sdmmc_io.c b/sys/dev/sdmmc/sdmmc_io.c
index 9f57eda6d12..160d9b09ff4 100644
--- a/sys/dev/sdmmc/sdmmc_io.c
+++ b/sys/dev/sdmmc/sdmmc_io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmc_io.c,v 1.13 2017/10/23 13:47:17 jmcneill Exp $ */
+/* $NetBSD: sdmmc_io.c,v 1.14 2018/10/14 17:37:40 jdolecek Exp $ */
/* $OpenBSD: sdmmc_io.c,v 1.10 2007/09/17 01:33:33 krw Exp $ */
/*
@@ -20,7 +20,7 @@
/* Routines for SD I/O cards. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc_io.c,v 1.13 2017/10/23 13:47:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc_io.c,v 1.14 2018/10/14 17:37:40 jdolecek Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -636,12 +636,11 @@ sdmmc_intr_establish(device_t dev, int (*fun)(void *), void *arg,
if (sc->sc_sct->card_enable_intr == NULL)
return NULL;
- ih = malloc(sizeof *ih, M_DEVBUF, M_WAITOK|M_CANFAIL|M_ZERO);
+ ih = malloc(sizeof *ih, M_DEVBUF, M_WAITOK|M_ZERO);
if (ih == NULL)
return NULL;
- ih->ih_name = malloc(strlen(name) + 1, M_DEVBUF,
- M_WAITOK|M_CANFAIL|M_ZERO);
+ ih->ih_name = malloc(strlen(name) + 1, M_DEVBUF, M_WAITOK|M_ZERO);
if (ih->ih_name == NULL) {
free(ih, M_DEVBUF);
return NULL;