From d1d70d03b8cd8ef17be93bb0af479d56a705a380 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 6 Dec 2006 20:35:35 -0800
Subject: [PATCH] --- yaml --- r: 42770 b: refs/heads/master c:
 89fc9a1a79725c3e5c3b66cb6bd2c7d9eeab29fa h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c3ba28244cda..b6abb3900e33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e45f4676108d19ae93918f06cb6731c86108341a
+refs/heads/master: 89fc9a1a79725c3e5c3b66cb6bd2c7d9eeab29fa
diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c
index 09f2c74a40c5..1a3c963dc48a 100644
--- a/trunk/drivers/spi/spi.c
+++ b/trunk/drivers/spi/spi.c
@@ -447,7 +447,9 @@ static int __unregister(struct device *dev, void *unused)
  */
 void spi_unregister_master(struct spi_master *master)
 {
-	(void) device_for_each_child(master->cdev.dev, NULL, __unregister);
+	int dummy;
+
+	dummy = device_for_each_child(master->cdev.dev, NULL, __unregister);
 	class_device_unregister(&master->cdev);
 }
 EXPORT_SYMBOL_GPL(spi_unregister_master);