From 06468a7ff04b4ae3d0b5b7c6c938baecf67f56e3 Mon Sep 17 00:00:00 2001 From: Dominik Brodowski Date: Wed, 7 Sep 2005 16:00:28 -0700 Subject: [PATCH] --- yaml --- r: 9309 b: refs/heads/master c: 8e5d17ebe41eb98a538ef13aad36da5136701aab h: refs/heads/master i: 9307: 14bb42d6a805391fe9e41c85f1991f00ba0b5b03 v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/yenta_socket.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 46fea66ede10..c9bcb9e6c726 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a413c09094e4df714c274690928dcf8125daf7e8 +refs/heads/master: 8e5d17ebe41eb98a538ef13aad36da5136701aab diff --git a/trunk/drivers/pcmcia/yenta_socket.c b/trunk/drivers/pcmcia/yenta_socket.c index 53a02f085800..80806c9b43ad 100644 --- a/trunk/drivers/pcmcia/yenta_socket.c +++ b/trunk/drivers/pcmcia/yenta_socket.c @@ -987,11 +987,12 @@ static void yenta_config_init(struct yenta_socket *socket) { u16 bridge; struct pci_dev *dev = socket->dev; + struct pci_bus_region region; - pci_set_power_state(socket->dev, 0); + pcibios_resource_to_bus(socket->dev, ®ion, &dev->resource[0]); config_writel(socket, CB_LEGACY_MODE_BASE, 0); - config_writel(socket, PCI_BASE_ADDRESS_0, dev->resource[0].start); + config_writel(socket, PCI_BASE_ADDRESS_0, region.start); config_writew(socket, PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMORY |