Module Name: src
Committed By: riastradh
Date: Fri Feb 11 23:48:41 UTC 2022
Modified Files:
src/sys/arch/arm/samsung: exynos_pinctrl.c
Log Message:
exyopctl(4): Don't leak a duplicate softc on attach.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/samsung/exynos_pinctrl.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/arch/arm/samsung/exynos_pinctrl.c
diff -u src/sys/arch/arm/samsung/exynos_pinctrl.c:1.21 src/sys/arch/arm/samsung/exynos_pinctrl.c:1.22
--- src/sys/arch/arm/samsung/exynos_pinctrl.c:1.21 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/samsung/exynos_pinctrl.c Fri Feb 11 23:48:41 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_pinctrl.c,v 1.21 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: exynos_pinctrl.c,v 1.22 2022/02/11 23:48:41 riastradh Exp $ */
/*-
* Copyright (c) 2015, 2020 The NetBSD Foundation, Inc.
@@ -34,14 +34,13 @@
#include "gpio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_pinctrl.c,v 1.21 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_pinctrl.c,v 1.22 2022/02/11 23:48:41 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/device.h>
#include <sys/intr.h>
#include <sys/systm.h>
-#include <sys/kmem.h>
#include <sys/gpio.h>
#include <dev/gpio/gpiovar.h>
@@ -93,8 +92,7 @@ exynos_pinctrl_match(device_t parent, cf
static void
exynos_pinctrl_attach(device_t parent, device_t self, void *aux)
{
- struct exynos_pinctrl_softc * const sc
- = kmem_zalloc(sizeof(*sc), KM_SLEEP);
+ struct exynos_pinctrl_softc * const sc = device_private(self);
struct fdt_attach_args * const faa = aux;
bus_addr_t addr;
bus_size_t size;
@@ -107,7 +105,6 @@ exynos_pinctrl_attach(device_t parent, d
}
aprint_normal(" pinctrl @ 0x%08x ", (uint)addr);
- self->dv_private = sc;
sc->sc_dev = self;
sc->sc_bst = faa->faa_bst;
sc->sc_epb = of_compatible_lookup(faa->faa_phandle, compat_data)->data;
