From 01aae97196f2cdfbfebc5a0365bad82d98975588 Mon Sep 17 00:00:00 2001 From: Matti Linnanvuori Date: Mon, 5 Nov 2007 14:51:02 -0800 Subject: 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/telephony/phonedev.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'drivers') 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); } -- cgit v1.1