diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
| commit | a2013a13e68354e0c8f3696b69701803e13fb737 (patch) | |
| tree | a7e1da6bfad1aa2afd83f401874d606269ce90b4 /net/rfkill | |
| parent | dadfab4873256d2145640c0ce468fcbfb48977fe (diff) | |
| parent | 106f9d9337f65bd428c0c79f650e3489e458d771 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina:
"Usual stuff -- comment/printk typo fixes, documentation updates, dead
code elimination."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
HOWTO: fix double words typo
x86 mtrr: fix comment typo in mtrr_bp_init
propagate name change to comments in kernel source
doc: Update the name of profiling based on sysfs
treewide: Fix typos in various drivers
treewide: Fix typos in various Kconfig
wireless: mwifiex: Fix typo in wireless/mwifiex driver
messages: i2o: Fix typo in messages/i2o
scripts/kernel-doc: check that non-void fcts describe their return value
Kernel-doc: Convention: Use a "Return" section to describe return values
radeon: Fix typo and copy/paste error in comments
doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
various: Fix spelling of "asynchronous" in comments.
Fix misspellings of "whether" in comments.
eisa: Fix spelling of "asynchronous".
various: Fix spelling of "registered" in comments.
doc: fix quite a few typos within Documentation
target: iscsi: fix comment typos in target/iscsi drivers
treewide: fix typo of "suport" in various comments and Kconfig
treewide: fix typo of "suppport" in various comments
...
Diffstat (limited to 'net/rfkill')
| -rw-r--r-- | net/rfkill/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rfkill/core.c b/net/rfkill/core.c index a5c952741279..9b9be5279f5d 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c | |||
| @@ -676,7 +676,7 @@ static ssize_t rfkill_soft_store(struct device *dev, | |||
| 676 | rfkill_set_block(rfkill, state); | 676 | rfkill_set_block(rfkill, state); |
| 677 | mutex_unlock(&rfkill_global_mutex); | 677 | mutex_unlock(&rfkill_global_mutex); |
| 678 | 678 | ||
| 679 | return err ?: count; | 679 | return count; |
| 680 | } | 680 | } |
| 681 | 681 | ||
| 682 | static u8 user_state_from_blocked(unsigned long state) | 682 | static u8 user_state_from_blocked(unsigned long state) |
| @@ -721,7 +721,7 @@ static ssize_t rfkill_state_store(struct device *dev, | |||
| 721 | rfkill_set_block(rfkill, state == RFKILL_USER_STATE_SOFT_BLOCKED); | 721 | rfkill_set_block(rfkill, state == RFKILL_USER_STATE_SOFT_BLOCKED); |
| 722 | mutex_unlock(&rfkill_global_mutex); | 722 | mutex_unlock(&rfkill_global_mutex); |
| 723 | 723 | ||
| 724 | return err ?: count; | 724 | return count; |
| 725 | } | 725 | } |
| 726 | 726 | ||
| 727 | static ssize_t rfkill_claim_show(struct device *dev, | 727 | static ssize_t rfkill_claim_show(struct device *dev, |