Module Name: src
Committed By: thorpej
Date: Sun Apr 18 16:46:06 UTC 2021
Modified Files:
src/sys/arch/arm/ep93xx [thorpej-cfargs]: eppcic.c
Log Message:
config_found() takes a device_t, not a softc. This is a bug left-over
from decoupling of device_t / softcs long ago.
To generate a diff of this commit:
cvs rdiff -u -r1.8.10.1 -r1.8.10.2 src/sys/arch/arm/ep93xx/eppcic.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/ep93xx/eppcic.c
diff -u src/sys/arch/arm/ep93xx/eppcic.c:1.8.10.1 src/sys/arch/arm/ep93xx/eppcic.c:1.8.10.2
--- src/sys/arch/arm/ep93xx/eppcic.c:1.8.10.1 Tue Mar 23 07:14:43 2021
+++ src/sys/arch/arm/ep93xx/eppcic.c Sun Apr 18 16:46:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: eppcic.c,v 1.8.10.1 2021/03/23 07:14:43 thorpej Exp $ */
+/* $NetBSD: eppcic.c,v 1.8.10.2 2021/04/18 16:46:06 thorpej Exp $ */
/*
* Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eppcic.c,v 1.8.10.1 2021/03/23 07:14:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eppcic.c,v 1.8.10.2 2021/04/18 16:46:06 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -242,8 +242,8 @@ eppcic_config_socket(struct eppcic_handl
paa.paa_busname = "pcmcia";
paa.pct = (pcmcia_chipset_tag_t)&eppcic_functions;
paa.pch = (pcmcia_chipset_handle_t)ph;
- ph->ph_card = config_found((void*)sc, &paa, eppcic_print, CFARG_EOL);
-
+ ph->ph_card = config_found(sc->sc_dev, &paa, eppcic_print, CFARG_EOL);
+
epgpio_intr_establish(sc->sc_gpio, ph->ph_port, ph->ph_cd[0],
EDGE_TRIGGER | FALLING_EDGE | DEBOUNCE,
IPL_TTY, eppcic_intr_carddetect, ph);
