From 07fb02cbcbd61d89c0cfc279727b1be1e3a4be49 Mon Sep 17 00:00:00 2001 From: christos Date: Sun, 10 Mar 2002 22:27:04 +0000 Subject: [PATCH] Undo my previous change that worked around a problem attaching a 3c562d. This is handled correctly now in the driver itself. From Hayakawa Koichi , thanks. --- sys/dev/cardbus/rbus.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/cardbus/rbus.c b/sys/dev/cardbus/rbus.c index f737b3ddc2d4..f600d6df7700 100644 --- a/sys/dev/cardbus/rbus.c +++ b/sys/dev/cardbus/rbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: rbus.c,v 1.12 2001/12/24 09:37:53 christos Exp $ */ +/* $NetBSD: rbus.c,v 1.13 2002/03/10 22:27:04 christos Exp $ */ /* * Copyright (c) 1999 and 2000 * HAYAKAWA Koichi. All rights reserved. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rbus.c,v 1.12 2001/12/24 09:37:53 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rbus.c,v 1.13 2002/03/10 22:27:04 christos Exp $"); #include #include @@ -90,7 +90,7 @@ rbus_space_alloc_subregion(rbt, substart, subend, addr, size, mask, align, flags bus_space_handle_t *bshp; { bus_addr_t decodesize = mask + 1; - bus_addr_t boundary, search_addr, search_end; + bus_addr_t boundary, search_addr; int val; bus_addr_t result; int exflags = EX_FAST | EX_NOWAIT | EX_MALLOCOK; @@ -139,13 +139,13 @@ rbus_space_alloc_subregion(rbt, substart, subend, addr, size, mask, align, flags boundary = decodesize > align ? decodesize : align; search_addr = (substart & ~(boundary - 1)) + addr; - search_end = subend + addr; if (search_addr < substart) { search_addr += boundary; } + val = 1; - for (; search_addr + size <= search_end; + for (; search_addr + size <= subend; search_addr += boundary) { val = extent_alloc_subregion(rbt->rb_ext, search_addr, search_addr + size, size,