66c66
< __FBSDID("$FreeBSD: head/sys/sparc64/sbus/dma_sbus.c 182062 2008-08-23 15:20:33Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/sparc64/sbus/dma_sbus.c 182876 2008-09-08 20:20:44Z marius $");
73d72
< #include <sys/resource.h>
181c180
< int error, burst, children;
---
> int error, i;
191,192c190,191
< lsc->sc_rid = 0;
< lsc->sc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &lsc->sc_rid,
---
> i = 0;
> lsc->sc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &i,
198,199d196
< lsc->sc_regt = rman_get_bustag(lsc->sc_res);
< lsc->sc_regh = rman_get_bushandle(lsc->sc_res);
249,251c246,248
< burst = sbus_get_burstsz(dev);
< lsc->sc_burst = (burst & SBUS_BURST_32) ? 32 :
< (burst & SBUS_BURST_16) ? 16 : 0;
---
> i = sbus_get_burstsz(dev);
> lsc->sc_burst = (i & SBUS_BURST_32) ? 32 :
> (i & SBUS_BURST_16) ? 16 : 0;
254,259d250
< error = lsi64854_attach(lsc);
< if (error != 0) {
< device_printf(dev, "lsi64854_attach failed\n");
< goto fail_lpdma;
< }
<
261c252
< children = 0;
---
> i = 0;
265c256
< if (children != 0) {
---
> if (i != 0) {
279c270
< children++;
---
> i++;
283,284d273
< fail_lpdma:
< bus_dma_tag_destroy(lsc->sc_parent_dmat);
286c275,276
< bus_release_resource(dev, SYS_RES_MEMORY, lsc->sc_rid, lsc->sc_res);
---
> bus_release_resource(dev, SYS_RES_MEMORY, rman_get_rid(lsc->sc_res),
> lsc->sc_res);