From a39d9144bf78a5f12c2fe7323a98d7449127d559 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sun, 7 Jun 2009 12:26:52 +0200 Subject: [PATCH] --- yaml --- r: 150807 b: refs/heads/master c: 207ee1621722876bb79828689582bf77fd1be200 h: refs/heads/master i: 150805: c72d77a2260081271821c181978d1da1da972e26 150803: a398e30651c2041ad74c80b553d0e4f995cdffa9 150799: 25b9e88dd34446169162dc323bf79b8fde7e7fcf v: v3 --- [refs] | 2 +- trunk/net/rfkill/core.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2560cb3c82ec..6c74a7af35a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b9c5aaeedfda256ed77094303e2a7242c3290da +refs/heads/master: 207ee1621722876bb79828689582bf77fd1be200 diff --git a/trunk/net/rfkill/core.c b/trunk/net/rfkill/core.c index 11b7314723df..e161ebc40a35 100644 --- a/trunk/net/rfkill/core.c +++ b/trunk/net/rfkill/core.c @@ -1134,7 +1134,8 @@ static int rfkill_fop_release(struct inode *inode, struct file *file) #ifdef CONFIG_RFKILL_INPUT if (data->input_handler) - atomic_dec(&rfkill_input_disabled); + if (atomic_dec_return(&rfkill_input_disabled) == 0) + printk(KERN_DEBUG "rfkill: input handler enabled\n"); #endif kfree(data); @@ -1157,7 +1158,8 @@ static long rfkill_fop_ioctl(struct file *file, unsigned int cmd, mutex_lock(&data->mtx); if (!data->input_handler) { - atomic_inc(&rfkill_input_disabled); + if (atomic_inc_return(&rfkill_input_disabled) == 1) + printk(KERN_DEBUG "rfkill: input handler disabled\n"); data->input_handler = true; }