From e8836fd7f513eaf1628730ff387761fd87378ae1 Mon Sep 17 00:00:00 2001 From: Matti Linnanvuori Date: Mon, 5 Nov 2007 14:51:02 -0800 Subject: [PATCH] --- yaml --- r: 73208 b: refs/heads/master c: 01aae97196f2cdfbfebc5a0365bad82d98975588 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/telephony/phonedev.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 149e91da418c..51e3e686ebb0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: def6ae26a9e69c3e6d0f0054524c76fd32420ecd +refs/heads/master: 01aae97196f2cdfbfebc5a0365bad82d98975588 diff --git a/trunk/drivers/telephony/phonedev.c b/trunk/drivers/telephony/phonedev.c index 4d8c2a5b3297..bcea8d9b718c 100644 --- a/trunk/drivers/telephony/phonedev.c +++ b/trunk/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); }