From f19a4bb50c68d1ad1abda990db26510520b4700f Mon Sep 17 00:00:00 2001 From: Ivan Kokshaysky Date: Mon, 27 Jun 2005 16:28:02 -0700 Subject: [PATCH] --- yaml --- r: 3741 b: refs/heads/master c: 7925407aa02653ba462b1d8b0b1229b99aee5411 h: refs/heads/master i: 3739: b878497d23d4a949d02e133116ff7061bb6f1974 v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/yenta_socket.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 630ce54b626f..5c5851371391 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c803e8e2f15d02c5ad0a3888eea2bbd31dc59c5 +refs/heads/master: 7925407aa02653ba462b1d8b0b1229b99aee5411 diff --git a/trunk/drivers/pcmcia/yenta_socket.c b/trunk/drivers/pcmcia/yenta_socket.c index bee05362fd24..02b23abc2df1 100644 --- a/trunk/drivers/pcmcia/yenta_socket.c +++ b/trunk/drivers/pcmcia/yenta_socket.c @@ -549,6 +549,11 @@ static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typ unsigned offset; unsigned mask; + res = socket->dev->resource + PCI_BRIDGE_RESOURCES + nr; + /* Already allocated? */ + if (res->parent) + return 0; + /* The granularity of the memory limit is 4kB, on IO it's 4 bytes */ mask = ~0xfff; if (type & IORESOURCE_IO) @@ -556,7 +561,6 @@ static void yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typ offset = 0x1c + 8*nr; bus = socket->dev->subordinate; - res = socket->dev->resource + PCI_BRIDGE_RESOURCES + nr; res->name = bus->name; res->flags = type; res->start = 0;