lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

telephony: phonedev panics if unregistering device not registered [Bug 9266]

Browse Source 
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 <mattilinnanvuori@yahoo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Matti Linnanvuori
2007-11-05 14:51:02 -08:00
committed by Linus Torvalds
parent def6ae26a9
commit 01aae97196
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/telephony/phonedev.c
View File

@@ -120,8 +120,7 @@ int phone_register_device(struct phone_device *p, int unit)
void phone_unregister_device(struct phone_device *pfd) void phone_unregister_device(struct phone_device *pfd)
{ {
mutex_lock(&phone_lock); mutex_lock(&phone_lock);
if (phone_device[pfd->minor] != pfd) if (likely(phone_device[pfd->minor] == pfd))
panic("phone: bad unregister");
phone_device[pfd->minor] = NULL; phone_device[pfd->minor] = NULL;
mutex_unlock(&phone_lock); mutex_unlock(&phone_lock);
} }