From afb0c4e64d0a0cc55a47ae5d1fef7f64e3dcdc31 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Tue, 2 Aug 2005 21:51:36 +1000 Subject: [PATCH] --- yaml --- r: 5588 b: refs/heads/master c: f7d1d23c301e0ce82c801f3b5800be6341752a1f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/yenta_socket.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bceb9c77d5cc..2c80229dcfe3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a351e30d72d409ec62c83f380e330e0baa584b4 +refs/heads/master: f7d1d23c301e0ce82c801f3b5800be6341752a1f diff --git a/trunk/drivers/pcmcia/yenta_socket.c b/trunk/drivers/pcmcia/yenta_socket.c index 6837491f021c..91e7457d5b04 100644 --- a/trunk/drivers/pcmcia/yenta_socket.c +++ b/trunk/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; } }