Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=01aae97196f2cdfbfebc5a0365bad82d98975588
Commit:     01aae97196f2cdfbfebc5a0365bad82d98975588
Parent:     def6ae26a9e69c3e6d0f0054524c76fd32420ecd
Author:     Matti Linnanvuori <[EMAIL PROTECTED]>
AuthorDate: Mon Nov 5 14:51:02 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Nov 5 15:12:33 2007 -0800

    telephony: phonedev panics if unregistering device not registered [Bug 9266]
    
    Remove panic from phonedev.  See
    
        http://bugzilla.kernel.org/show_bug.cgi?id=9266
    
    for details (phonedev panics if unregistering device not registered).
    
    Signed-off-by: Matti Linnanvuori <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/telephony/phonedev.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/telephony/phonedev.c b/drivers/telephony/phonedev.c
index 4d8c2a5..bcea8d9 100644
--- a/drivers/telephony/phonedev.c
+++ b/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);
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to