diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 11:50:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 11:50:34 -0400 |
| commit | 1aacb90eaaac057c10fd746e189553e04cfeb291 (patch) | |
| tree | eaf5b2eddc9e2e446b5402c106a3bf086aee925a /Documentation/gpio/consumer.txt | |
| parent | b05d59dfceaea72565b1648af929b037b0f96d7f (diff) | |
| parent | 31789538e3ba7dd164e063d4978c96af1894be4c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
Pull trivial tree changes from Jiri Kosina:
"Usual pile of patches from trivial tree that make the world go round"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
staging: go7007: remove reference to CONFIG_KMOD
aic7xxx: Remove obsolete preprocessor define
of: dma: doc fixes
doc: fix incorrect formula to calculate CommitLimit value
doc: Note need of bc in the kernel build from 3.10 onwards
mm: Fix printk typo in dmapool.c
modpost: Fix comment typo "Modules.symvers"
Kconfig.debug: Grammar s/addition/additional/
wimax: Spelling s/than/that/, wording s/destinatary/recipient/
aic7xxx: Spelling s/termnation/termination/
arm64: mm: Remove superfluous "the" in comment
of: Spelling s/anonymouns/anonymous/
dma: imx-sdma: Spelling s/determnine/determine/
ath10k: Improve grammar in comments
ath6kl: Spelling s/determnine/determine/
of: Improve grammar for of_alias_get_id() documentation
drm/exynos: Spelling s/contro/control/
radio-bcm2048.c: fix wrong overflow check
doc: printk-formats: do not mention casts for u64/s64
doc: spelling error changes
...
Diffstat (limited to 'Documentation/gpio/consumer.txt')
| -rw-r--r-- | Documentation/gpio/consumer.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gpio/consumer.txt b/Documentation/gpio/consumer.txt index 09854fe59307..d8abfc31abbe 100644 --- a/Documentation/gpio/consumer.txt +++ b/Documentation/gpio/consumer.txt | |||
| @@ -41,7 +41,7 @@ Both functions return either a valid GPIO descriptor, or an error code checkable | |||
| 41 | with IS_ERR() (they will never return a NULL pointer). -ENOENT will be returned | 41 | with IS_ERR() (they will never return a NULL pointer). -ENOENT will be returned |
| 42 | if and only if no GPIO has been assigned to the device/function/index triplet, | 42 | if and only if no GPIO has been assigned to the device/function/index triplet, |
| 43 | other error codes are used for cases where a GPIO has been assigned but an error | 43 | other error codes are used for cases where a GPIO has been assigned but an error |
| 44 | occured while trying to acquire it. This is useful to discriminate between mere | 44 | occurred while trying to acquire it. This is useful to discriminate between mere |
| 45 | errors and an absence of GPIO for optional GPIO parameters. | 45 | errors and an absence of GPIO for optional GPIO parameters. |
| 46 | 46 | ||
| 47 | Device-managed variants of these functions are also defined: | 47 | Device-managed variants of these functions are also defined: |