diff options
Diffstat (limited to 'sys/arch/arm/xscale')
| -rw-r--r-- | sys/arch/arm/xscale/pxa27x_udc.c | 4 | ||||
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_mmc.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/arm/xscale/pxa27x_udc.c b/sys/arch/arm/xscale/pxa27x_udc.c index 23a06d39a6f..e606e3f4147 100644 --- a/sys/arch/arm/xscale/pxa27x_udc.c +++ b/sys/arch/arm/xscale/pxa27x_udc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa27x_udc.c,v 1.27 2010/09/07 16:21:35 deraadt Exp $ */ +/* $OpenBSD: pxa27x_udc.c,v 1.28 2011/04/07 15:30:15 miod Exp $ */ /* * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org> @@ -193,7 +193,7 @@ pxaudc_attach(struct pxaudc_softc *sc, void *aux) printf(": unable to establish connect interrupt\n"); pxa2x0_intr_disestablish(sc->sc_ih); bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_size); - sc->sc_ioh = NULL; + sc->sc_ioh = 0; sc->sc_size = 0; return; } diff --git a/sys/arch/arm/xscale/pxa2x0_mmc.c b/sys/arch/arm/xscale/pxa2x0_mmc.c index b8be421d9d4..6451c19677e 100644 --- a/sys/arch/arm/xscale/pxa2x0_mmc.c +++ b/sys/arch/arm/xscale/pxa2x0_mmc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa2x0_mmc.c,v 1.9 2009/09/03 21:40:29 marex Exp $ */ +/* $OpenBSD: pxa2x0_mmc.c,v 1.10 2011/04/07 15:30:15 miod Exp $ */ /* * Copyright (c) 2007 Uwe Stuehler <uwe@openbsd.org> @@ -203,9 +203,9 @@ fail: pxa2x0_gpio_intr_disestablish(sc->sc_card_ih); sc->sc_card_ih = NULL; } - if (sc->sc_ioh != NULL) { + if (sc->sc_ioh != 0) { bus_space_unmap(sc->sc_iot, sc->sc_ioh, PXA2X0_MMC_SIZE); - sc->sc_ioh = NULL; + sc->sc_ioh = 0; } pxa2x0_clkman_config(CKEN_MMC, 0); } |