---

yaml --- r: 73208 b: refs/heads/master c: 01aae97 h: refs/heads/master v: v3
git-mirror · Nov 5, 2007 · e8836fd · e8836fd
1 parent fe3f844
commit e8836fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: def6ae26a9e69c3e6d0f0054524c76fd32420ecd
+refs/heads/master: 01aae97196f2cdfbfebc5a0365bad82d98975588
diff --git a/trunk/drivers/telephony/phonedev.c b/trunk/drivers/telephony/phonedev.c
@@ -120,9 +120,8 @@ int phone_register_device(struct phone_device *p, int unit)
 void phone_unregister_device(struct phone_device *pfd)
 {
 	mutex_lock(&phone_lock);
-	if (phone_device[pfd->minor] != pfd)
-		panic("phone: bad unregister");
-	phone_device[pfd->minor] = NULL;
+	if (likely(phone_device[pfd->minor] == pfd))
+		phone_device[pfd->minor] = NULL;
 	mutex_unlock(&phone_lock);
 }