From 06f3b785ab13f51fa578cc18c5ee28649a2c6213 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sat, 30 Sep 2006 23:28:00 -0700 Subject: [PATCH] --- yaml --- r: 37652 b: refs/heads/master c: 74ae3221818eaf3884ceac931ba3cd2c00045483 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/cardbus.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 021c01608a53..f4f5acda19ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df10f4edd5f097251c62f1d4a3adea778100b4a8 +refs/heads/master: 74ae3221818eaf3884ceac931ba3cd2c00045483 diff --git a/trunk/drivers/pcmcia/cardbus.c b/trunk/drivers/pcmcia/cardbus.c index 3f6d51d11374..2d7effe7990d 100644 --- a/trunk/drivers/pcmcia/cardbus.c +++ b/trunk/drivers/pcmcia/cardbus.c @@ -138,7 +138,7 @@ int read_cb_mem(struct pcmcia_socket * s, int space, u_int addr, u_int len, void cs_dbg(s, 3, "read_cb_mem(%d, %#x, %u)\n", space, addr, len); - dev = pci_find_slot(s->cb_dev->subordinate->number, 0); + dev = pci_get_slot(s->cb_dev->subordinate, 0); if (!dev) goto fail; @@ -152,6 +152,9 @@ int read_cb_mem(struct pcmcia_socket * s, int space, u_int addr, u_int len, void } res = dev->resource + space - 1; + + pci_dev_put(dev); + if (!res->flags) goto fail;