aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pcmcia/yenta_socket.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 6837491f021c..91e7457d5b04 100644
--- 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
642 (yenta_search_res(socket, res, BRIDGE_IO_MIN))) { 642 (yenta_search_res(socket, res, BRIDGE_IO_MIN))) {
643 config_writel(socket, addr_start, res->start); 643 config_writel(socket, addr_start, res->start);
644 config_writel(socket, addr_end, res->end); 644 config_writel(socket, addr_end, res->end);
645 return;
645 } 646 }
646 } else { 647 } else {
647 if (type & IORESOURCE_PREFETCH) { 648 if (type & IORESOURCE_PREFETCH) {
@@ -650,6 +651,7 @@ static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typ
650 (yenta_search_res(socket, res, BRIDGE_MEM_MIN))) { 651 (yenta_search_res(socket, res, BRIDGE_MEM_MIN))) {
651 config_writel(socket, addr_start, res->start); 652 config_writel(socket, addr_start, res->start);
652 config_writel(socket, addr_end, res->end); 653 config_writel(socket, addr_end, res->end);
654 return;
653 } 655 }
654 /* Approximating prefetchable by non-prefetchable */ 656 /* Approximating prefetchable by non-prefetchable */
655 res->flags = IORESOURCE_MEM; 657 res->flags = IORESOURCE_MEM;
@@ -659,6 +661,7 @@ static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typ
659 (yenta_search_res(socket, res, BRIDGE_MEM_MIN))) { 661 (yenta_search_res(socket, res, BRIDGE_MEM_MIN))) {
660 config_writel(socket, addr_start, res->start); 662 config_writel(socket, addr_start, res->start);
661 config_writel(socket, addr_end, res->end); 663 config_writel(socket, addr_end, res->end);
664 return;
662 } 665 }
663 } 666 }
664 667