The patch titled
telephony: phonedev panics if unregistering device not registered [Bug 9266]
has been added to the -mm tree. Its filename is
telephony-phonedev-panics-if-unregistering-device-not-registered.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: telephony: phonedev panics if unregistering device not registered [Bug 9266]
From: Matti Linnanvuori <mattilinnanvuori@xxxxxxxxx>
Remove panic from phonedev. See
http://bugzilla.kernel.org/show_bug.cgi?id=9266 for details.
Signed-off-by: Matti Linnanvuori <mattilinnanvuori@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/telephony/phonedev.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff -puN drivers/telephony/phonedev.c~telephony-phonedev-panics-if-unregistering-device-not-registered drivers/telephony/phonedev.c
--- a/drivers/telephony/phonedev.c~telephony-phonedev-panics-if-unregistering-device-not-registered
+++ a/drivers/telephony/phonedev.c
@@ -120,9 +120,8 @@ int phone_register_device(struct phone_d
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);
}
_
Patches currently in -mm which might be from mattilinnanvuori@xxxxxxxxx are
telephony-phonedev-panics-if-unregistering-device-not-registered.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
