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 <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:
parent
def6ae26a9
commit
01aae97196
1 changed files with 2 additions and 3 deletions
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue