From 88bcbb1b3c3732b8dc6577f5697ba9cb320eb2b7 Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Wed, 25 Oct 2006 19:56:55 -0400
Subject: [PATCH] --- yaml --- r: 40447 b: refs/heads/master c:
 f901b8c46fa9748b9d6836e9b158cf7be89447f1 h: refs/heads/master i:   40445:
 566123c151fd8579bcf3a81cfb08038d4cf05ff3   40443:
 b6227618658578a299cea8a0a8d6f80fef5e1c60   40439:
 8f1f2fa96d20111b5f4c844358ed84d15d99e450   40431:
 d400ce8aa1a4cae8d04b59d9c414755e859c49ad   40415:
 e52ecc31bf8dee4ceead09e2261915822bf8533d   40383:
 346ccadc778f62608de5e570e509c14771acf08f   40319:
 055b19267a1cfe34dee36e7cfb17b3c1e725ba55   40191:
 2c6f51615e3c7c4ebefc2761a75f9c01195aa92c   39935:
 b6c8e1c1af01857c4703b74ccc9f998722120c20 v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/pcmcia/ds.c | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8103e5019d0e..dd129f6336de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4deb7c1ed2b622b565c5330b475adc5a6cea30da
+refs/heads/master: f901b8c46fa9748b9d6836e9b158cf7be89447f1
diff --git a/trunk/drivers/pcmcia/ds.c b/trunk/drivers/pcmcia/ds.c
index af392bfee5a6..0f701921c13e 100644
--- a/trunk/drivers/pcmcia/ds.c
+++ b/trunk/drivers/pcmcia/ds.c
@@ -717,6 +717,7 @@ static int pcmcia_requery(struct device *dev, void * _data)
 static void pcmcia_bus_rescan(struct pcmcia_socket *skt)
 {
 	int no_devices=0;
+	int ret = 0;
 	unsigned long flags;
 
 	/* must be called with skt_mutex held */
@@ -729,7 +730,7 @@ static void pcmcia_bus_rescan(struct pcmcia_socket *skt)
 	 * missing resource information or other trouble, we need to
 	 * do this now. */
 	if (no_devices) {
-		int ret = pcmcia_card_add(skt);
+		ret = pcmcia_card_add(skt);
 		if (ret)
 			return;
 	}
@@ -741,7 +742,9 @@ static void pcmcia_bus_rescan(struct pcmcia_socket *skt)
 
 	/* we re-scan all devices, not just the ones connected to this
 	 * socket. This does not matter, though. */
-	bus_rescan_devices(&pcmcia_bus_type);
+	ret = bus_rescan_devices(&pcmcia_bus_type);
+	if (ret)
+		printk(KERN_INFO "pcmcia: bus_rescan_devices failed\n");
 }
 
 static inline int pcmcia_devmatch(struct pcmcia_device *dev,
@@ -1001,6 +1004,7 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,
 		struct device_attribute *attr, const char *buf, size_t count)
 {
 	struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
+	int ret;
 
 	if (!count)
 		return -EINVAL;
@@ -1009,7 +1013,10 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,
 	p_dev->allow_func_id_match = 1;
 	mutex_unlock(&p_dev->socket->skt_mutex);
 
-	bus_rescan_devices(&pcmcia_bus_type);
+	ret = bus_rescan_devices(&pcmcia_bus_type);
+	if (ret)
+		printk(KERN_INFO "pcmcia: bus_rescan_devices failed after "
+		       "allowing func_id matches\n");
 
 	return count;
 }