[PATCH] Obvious bugfix for yenta resource allocation

paulusmack · Linus Torvalds · commit f7d1d23c301e · 2005-08-02T08:28:48.000-07:00
Recent changes (well, dating from 12 July) have broken cardbus on my
powerbook: I get 3 messages saying "no resource of type xxx available,
trying to continue", and if I plug in my wireless card, it complains
that there are no resources allocated to the card.  This all worked in
2.6.12.

Looking at the code in yenta_socket.c, function yenta_allocate_res,
it's obvious what is wrong: if we get to line 639 (i.e. there wasn't a
usable preassigned resource), we will always flow through to line 668,
which is the printk that I was seeing, even if a resource was
successfully allocated.  It looks to me as though there should be a
return statement after the two config_writel's in each of the 3
branches of the if statements, so that the function returns after
successfully setting up the resource.

The patch below adds these return statements, and with this patch,
cardbus works on my powerbook once again.

Signed-off-by: Paul Mackerras &lt;paulus@samba.org&gt;
Acked-by: Dominik Brodowski &lt;linux@dominikbrodowski.net&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
@@ -642,6 +642,7 @@ static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typ
 		    (yenta_search_res(socket, res, BRIDGE_IO_MIN))) {
 			config_writel(socket, addr_start, res->start);
 			config_writel(socket, addr_end, res->end);
+			return;
 		}
 	} else {
 		if (type & IORESOURCE_PREFETCH) {
@@ -650,6 +651,7 @@ static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typ
 			    (yenta_search_res(socket, res, BRIDGE_MEM_MIN))) {
 				config_writel(socket, addr_start, res->start);
 				config_writel(socket, addr_end, res->end);
+				return;
 			}
 			/* Approximating prefetchable by non-prefetchable */
 			res->flags = IORESOURCE_MEM;
@@ -659,6 +661,7 @@ static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typ
 		    (yenta_search_res(socket, res, BRIDGE_MEM_MIN))) {
 			config_writel(socket, addr_start, res->start);
 			config_writel(socket, addr_end, res->end);
+			return;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -642,6 +642,7 @@ static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typ`
`642`	`642`	`(yenta_search_res(socket, res, BRIDGE_IO_MIN))) {`
`643`	`643`	`config_writel(socket, addr_start, res->start);`
`644`	`644`	`config_writel(socket, addr_end, res->end);`
	`645`	`+ return;`
`645`	`646`	`}`
`646`	`647`	`} else {`
`647`	`648`	`if (type & IORESOURCE_PREFETCH) {`
`@@ -650,6 +651,7 @@ static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typ`
`650`	`651`	`(yenta_search_res(socket, res, BRIDGE_MEM_MIN))) {`
`651`	`652`	`config_writel(socket, addr_start, res->start);`
`652`	`653`	`config_writel(socket, addr_end, res->end);`
	`654`	`+ return;`
`653`	`655`	`}`
`654`	`656`	`/* Approximating prefetchable by non-prefetchable */`
`655`	`657`	`res->flags = IORESOURCE_MEM;`
`@@ -659,6 +661,7 @@ static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typ`
`659`	`661`	`(yenta_search_res(socket, res, BRIDGE_MEM_MIN))) {`
`660`	`662`	`config_writel(socket, addr_start, res->start);`
`661`	`663`	`config_writel(socket, addr_end, res->end);`
	`664`	`+ return;`
`662`	`665`	`}`
`663`	`666`	`}`
`664`	`667`