From 235730bb91b7b0f6bd50e9381abe42ff663b928a Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 6 Dec 2006 20:36:29 -0800
Subject: [PATCH] --- yaml --- r: 42798 b: refs/heads/master c:
 3316eaa31e638d21dfa4a81a3322f8898981c591 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a181950c8acb..f0c6030ac4f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6c4021190c828d7fa24a464db589f86c6708341
+refs/heads/master: 3316eaa31e638d21dfa4a81a3322f8898981c591
diff --git a/trunk/drivers/misc/tifm_core.c b/trunk/drivers/misc/tifm_core.c
index ee326136d03b..d61df5c3ac36 100644
--- a/trunk/drivers/misc/tifm_core.c
+++ b/trunk/drivers/misc/tifm_core.c
@@ -219,8 +219,9 @@ static int tifm_device_remove(struct device *dev)
 	struct tifm_driver *drv = fm_dev->drv;
 
 	if (drv) {
-		if (drv->remove) drv->remove(fm_dev);
-		fm_dev->drv = 0;
+		if (drv->remove)
+			drv->remove(fm_dev);
+		fm_dev->drv = NULL;
 	}
 
 	put_device(dev);