summaryrefslogtreecommitdiff
path: root/sys/dev/sdmmc
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/sdmmc')
-rw-r--r--sys/dev/sdmmc/sdhc.c4
-rw-r--r--sys/dev/sdmmc/sdmmc.c6
-rw-r--r--sys/dev/sdmmc/sdmmc_io.c4
-rw-r--r--sys/dev/sdmmc/sdmmc_mem.c4
-rw-r--r--sys/dev/sdmmc/sdmmc_scsi.c12
5 files changed, 15 insertions, 15 deletions
diff --git a/sys/dev/sdmmc/sdhc.c b/sys/dev/sdmmc/sdhc.c
index 25af0462d7e..d3c79248ef5 100644
--- a/sys/dev/sdmmc/sdhc.c
+++ b/sys/dev/sdmmc/sdhc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdhc.c,v 1.37 2013/12/06 21:03:04 deraadt Exp $ */
+/* $OpenBSD: sdhc.c,v 1.38 2014/07/12 18:48:52 tedu Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -242,7 +242,7 @@ sdhc_host_found(struct sdhc_softc *sc, bus_space_tag_t iot,
return 0;
err:
- free(hp, M_DEVBUF);
+ free(hp, M_DEVBUF, 0);
sc->sc_host[sc->sc_nhosts - 1] = NULL;
sc->sc_nhosts--;
return (error);
diff --git a/sys/dev/sdmmc/sdmmc.c b/sys/dev/sdmmc/sdmmc.c
index fa962a717c9..ec14e473002 100644
--- a/sys/dev/sdmmc/sdmmc.c
+++ b/sys/dev/sdmmc/sdmmc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdmmc.c,v 1.33 2014/03/05 21:35:21 sthen Exp $ */
+/* $OpenBSD: sdmmc.c,v 1.34 2014/07/12 18:48:52 tedu Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -487,7 +487,7 @@ sdmmc_function_alloc(struct sdmmc_softc *sc)
void
sdmmc_function_free(struct sdmmc_function *sf)
{
- free(sf, M_DEVBUF);
+ free(sf, M_DEVBUF, 0);
}
/*
@@ -810,7 +810,7 @@ sdmmc_ioctl(struct device *self, u_long request, caddr_t addr)
return EFAULT;
if (ucmd->c_data)
- free(data, M_TEMP);
+ free(data, M_TEMP, 0);
break;
default:
diff --git a/sys/dev/sdmmc/sdmmc_io.c b/sys/dev/sdmmc/sdmmc_io.c
index b7137efb08e..4f8244d5fd3 100644
--- a/sys/dev/sdmmc/sdmmc_io.c
+++ b/sys/dev/sdmmc/sdmmc_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdmmc_io.c,v 1.19 2010/08/24 14:52:23 blambert Exp $ */
+/* $OpenBSD: sdmmc_io.c,v 1.20 2014/07/12 18:48:52 tedu Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -682,7 +682,7 @@ sdmmc_intr_disestablish(void *cookie)
}
splx(s);
- free(ih, M_DEVBUF);
+ free(ih, M_DEVBUF, 0);
}
/*
diff --git a/sys/dev/sdmmc/sdmmc_mem.c b/sys/dev/sdmmc/sdmmc_mem.c
index f06f5ac2d15..3d4d9d25c6a 100644
--- a/sys/dev/sdmmc/sdmmc_mem.c
+++ b/sys/dev/sdmmc/sdmmc_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdmmc_mem.c,v 1.18 2013/10/22 16:49:27 syl Exp $ */
+/* $OpenBSD: sdmmc_mem.c,v 1.19 2014/07/12 18:48:52 tedu Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -370,7 +370,7 @@ sdmmc_mem_send_cxd_data(struct sdmmc_softc *sc, int opcode, void *data,
out:
if (ptr != NULL)
- free(ptr, M_DEVBUF);
+ free(ptr, M_DEVBUF, 0);
return error;
}
diff --git a/sys/dev/sdmmc/sdmmc_scsi.c b/sys/dev/sdmmc/sdmmc_scsi.c
index b27f5d45086..1332a7f3d79 100644
--- a/sys/dev/sdmmc/sdmmc_scsi.c
+++ b/sys/dev/sdmmc/sdmmc_scsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdmmc_scsi.c,v 1.30 2011/07/17 22:46:48 matthew Exp $ */
+/* $OpenBSD: sdmmc_scsi.c,v 1.31 2014/07/12 18:48:52 tedu Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -152,8 +152,8 @@ sdmmc_scsi_attach(struct sdmmc_softc *sc)
sc->sc_scsibus = NULL;
sdmmc_free_ccbs(scbus);
free_sctgt:
- free(scbus->sc_tgt, M_DEVBUF);
- free(scbus, M_DEVBUF);
+ free(scbus->sc_tgt, M_DEVBUF, 0);
+ free(scbus, M_DEVBUF, 0);
}
void
@@ -180,10 +180,10 @@ sdmmc_scsi_detach(struct sdmmc_softc *sc)
config_detach(scbus->sc_child, DETACH_FORCE);
if (scbus->sc_tgt != NULL)
- free(scbus->sc_tgt, M_DEVBUF);
+ free(scbus->sc_tgt, M_DEVBUF, 0);
sdmmc_free_ccbs(scbus);
- free(scbus, M_DEVBUF);
+ free(scbus, M_DEVBUF, 0);
sc->sc_scsibus = NULL;
}
@@ -224,7 +224,7 @@ void
sdmmc_free_ccbs(struct sdmmc_scsi_softc *scbus)
{
if (scbus->sc_ccbs != NULL) {
- free(scbus->sc_ccbs, M_DEVBUF);
+ free(scbus->sc_ccbs, M_DEVBUF, 0);
scbus->sc_ccbs = NULL;
}
}