Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150807
b: refs/heads/master
c: 207ee16
h: refs/heads/master
i:
  150805: c72d77a
  150803: a398e30
  150799: 25b9e88
v: v3
  • Loading branch information
Johannes Berg authored and John W. Linville committed Jun 10, 2009
1 parent 77acc4f commit a39d914
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9b9c5aaeedfda256ed77094303e2a7242c3290da
refs/heads/master: 207ee1621722876bb79828689582bf77fd1be200
6 changes: 4 additions & 2 deletions trunk/net/rfkill/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
}

Expand Down

0 comments on commit a39d914

Please sign in to comment.