diff options
| author | Matti Linnanvuori <mattilinnanvuori@yahoo.com> | 2007-11-05 14:51:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 15:12:33 -0800 |
| commit | 01aae97196f2cdfbfebc5a0365bad82d98975588 (patch) | |
| tree | f71b836d62dfe36ab9e842e8cedfa719ca63f018 /drivers/telephony | |
| parent | def6ae26a9e69c3e6d0f0054524c76fd32420ecd (diff) | |
| download | linux-3.10-01aae97196f2cdfbfebc5a0365bad82d98975588.tar.gz linux-3.10-01aae97196f2cdfbfebc5a0365bad82d98975588.tar.bz2 linux-3.10-01aae97196f2cdfbfebc5a0365bad82d98975588.zip | |
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>
Diffstat (limited to 'drivers/telephony')
| -rw-r--r-- | 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 4d8c2a5b329..bcea8d9b718 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); } |