From c47e727c7284c3c608c31015a6b2b64c45d408cc Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Wed, 3 Oct 2007 15:32:57 -0400
Subject: [PATCH] --- yaml --- r: 65655 b: refs/heads/master c:
 599473cf15a3fae78cbc3192cfb38ca04d5abc72 h: refs/heads/master i:   65653:
 fcbd10941684f7afdd4dad3f4cbea26babba26fb   65651:
 e19d2f0e9c49b84910860abc080e25673f628537   65647:
 8952f13bfb4b844171551ee0eaaabf2d83105883 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/mmc/core/sdio_irq.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 201addb87f77..3bb06f901605 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e01e4bcdd56209e70c39293e0c4c355d09364b8
+refs/heads/master: 599473cf15a3fae78cbc3192cfb38ca04d5abc72
diff --git a/trunk/drivers/mmc/core/sdio_irq.c b/trunk/drivers/mmc/core/sdio_irq.c
index e7865059e126..3bd3021f5e80 100644
--- a/trunk/drivers/mmc/core/sdio_irq.c
+++ b/trunk/drivers/mmc/core/sdio_irq.c
@@ -45,16 +45,22 @@ static int process_sdio_pending_irqs(struct mmc_card *card)
 				printk(KERN_WARNING "%s: pending IRQ for "
 					"non-existant function\n",
 					mmc_card_id(card));
+				ret = -EINVAL;
 			} else if (func->irq_handler) {
 				func->irq_handler(func);
 				count++;
-			} else
+			} else {
 				printk(KERN_WARNING "%s: pending IRQ with no handler\n",
 				       sdio_func_id(func));
+				ret = -EINVAL;
+			}
 		}
 	}
 
-	return count;
+	if (count)
+		return count;
+
+	return ret;
 }
 
 static int sdio_irq_thread(void *_host)