[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

Thu May 17 14:14:49 UTC 2012

details:   http://zrouter.org/hg/FreeBSD/head//rev/5ccaa7502b8a
changeset: 484:5ccaa7502b8a
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Thu May 17 17:13:25 2012 +0300
description:
Do not hold flash window mapped.

diffstat:

 head/sys/dev/ath/if_ath_ahb.c |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 7998cb88f484 -r 5ccaa7502b8a head/sys/dev/ath/if_ath_ahb.c

--- a/head/sys/dev/ath/if_ath_ahb.c	Mon May 14 14:18:22 2012 +0300
+++ b/head/sys/dev/ath/if_ath_ahb.c	Thu May 17 17:13:25 2012 +0300
@@ -153,6 +153,7 @@
 #endif
 	p = (void *) rman_get_bushandle(psc->sc_eeprom);
 	memcpy(sc->sc_eepromdata, p, ATH_EEPROM_DATA_SIZE * 2);
+	bus_release_resource(dev, SYS_RES_MEMORY, 0, psc->sc_eeprom);
 
 	/*
 	 * Arrange interrupt line.
@@ -204,7 +205,6 @@
 bad2:
 	bus_release_resource(dev, SYS_RES_IRQ, 0, psc->sc_irq);
 bad1:
-	bus_release_resource(dev, SYS_RES_MEMORY, 0, psc->sc_eeprom);
 bad0:
 	bus_release_resource(dev, SYS_RES_MEMORY, 0, psc->sc_sr);
 bad:
@@ -231,7 +231,6 @@
 
 	bus_dma_tag_destroy(sc->sc_dmat);
 	bus_release_resource(dev, SYS_RES_MEMORY, 0, psc->sc_sr);
-	bus_release_resource(dev, SYS_RES_MEMORY, 0, psc->sc_eeprom);
 	/* XXX?! */
 	if (sc->sc_eepromdata)
 		free(sc->sc_eepromdata, M_TEMP);
