diff options
| author | Linus Torvalds | 2014-12-12 10:08:06 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2014-12-12 10:08:06 -0800 |
| commit | a7cb7bb664543e4562ab0e9a072470d2d18c761f (patch) | |
| tree | 7c72fbbc681617be8c89b63c7e98a7e7b09c72de /tools | |
| parent | ccb5a4910d0ca7b1742b9217db2e1b95817e25ac (diff) | |
| parent | 078014dd36989c66378dfe80066c3f8a1f6952e8 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree update from Jiri Kosina:
"Usual stuff: documentation updates, printk() fixes, etc"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits)
intel_ips: fix a type in error message
cpufreq: cpufreq-dt: Move newline to end of error message
ps3rom: fix error return code
treewide: fix typo in printk and Kconfig
ARM: dts: bcm63138: change "interupts" to "interrupts"
Replace mentions of "list_struct" to "list_head"
kernel: trace: fix printk message
scsi: mpt2sas: fix ioctl in comment
zbud, zswap: change module author email
clocksource: Fix 'clcoksource' typo in comment
arm: fix wording of "Crotex" in CONFIG_ARCH_EXYNOS3 help
gpio: msm-v1: make boolean argument more obvious
usb: Fix typo in usb-serial-simple.c
PCI: Fix comment typo 'COMFIG_PM_OPS'
powerpc: Fix comment typo 'CONIFG_8xx'
powerpc: Fix comment typos 'CONFiG_ALTIVEC'
clk: st: Spelling s/stucture/structure/
isci: Spelling s/stucture/structure/
usb: gadget: zero: Spelling s/infrastucture/infrastructure/
treewide: Fix company name in module descriptions
...
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c | 2 | ||||
| -rw-r--r-- | tools/usb/usbip/libsrc/list.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c b/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c index af4b0508be77..aaca1f44e788 100644 --- a/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c +++ b/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c @@ -342,7 +342,7 @@ int main(int argc, char *argv[]) iobuf[i].requested = ret; printf("submit: %d requests buf: %d\n", ret, i); } else - perror("unable to submit reqests"); + perror("unable to submit requests"); } /* if event is ready to read */ diff --git a/tools/usb/usbip/libsrc/list.h b/tools/usb/usbip/libsrc/list.h index 8d0c936e184f..5eaaa78e2c6a 100644 --- a/tools/usb/usbip/libsrc/list.h +++ b/tools/usb/usbip/libsrc/list.h @@ -98,7 +98,7 @@ static inline void list_del(struct list_head *entry) * list_entry - get the struct for this entry * @ptr: the &struct list_head pointer. * @type: the type of the struct this is embedded in. - * @member: the name of the list_struct within the struct. + * @member: the name of the list_head within the struct. */ #define list_entry(ptr, type, member) \ container_of(ptr, type, member) |