diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:51:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:51:45 -0400 |
| commit | 342ff1a1b558ebbdb8cbd55ab6a63eca8b2473ca (patch) | |
| tree | 1f967f283dade6e03897169bb29513354f49f910 /drivers/isdn | |
| parent | 50223e486cabdcf7e540e519da1f26bab3084e5d (diff) | |
| parent | 24ed7a97464db44592495f98cff8bcee02f92bc2 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
trivial: fix typo in aic7xxx comment
trivial: fix comment typo in drivers/ata/pata_hpt37x.c
trivial: typo in kernel-parameters.txt
trivial: fix typo in tracing documentation
trivial: add __init/__exit macros in drivers/gpio/bt8xxgpio.c
trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c
trivial: remove unnecessary semicolons
trivial: Fix duplicated word "options" in comment
trivial: kbuild: remove extraneous blank line after declaration of usage()
trivial: improve help text for mm debug config options
trivial: doc: hpfall: accept disk device to unload as argument
trivial: doc: hpfall: reduce risk that hpfall can do harm
trivial: SubmittingPatches: Fix reference to renumbered step
trivial: fix typos "man[ae]g?ment" -> "management"
trivial: media/video/cx88: add __init/__exit macros to cx88 drivers
trivial: fix typo in CONFIG_DEBUG_FS in gcov doc
trivial: fix missing printk space in amd_k7_smp_check
trivial: fix typo s/ketymap/keymap/ in comment
trivial: fix typo "to to" in multiple files
trivial: fix typos in comments s/DGBU/DBGU/
...
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/capi/capiutil.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/i4l/isdn_common.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c index 16f2e465e5f..26626eead82 100644 --- a/drivers/isdn/capi/capiutil.c +++ b/drivers/isdn/capi/capiutil.c | |||
| @@ -1019,7 +1019,7 @@ int __init cdebug_init(void) | |||
| 1019 | if (!g_debbuf->buf) { | 1019 | if (!g_debbuf->buf) { |
| 1020 | kfree(g_cmsg); | 1020 | kfree(g_cmsg); |
| 1021 | kfree(g_debbuf); | 1021 | kfree(g_debbuf); |
| 1022 | return -ENOMEM;; | 1022 | return -ENOMEM; |
| 1023 | } | 1023 | } |
| 1024 | g_debbuf->size = CDEBUG_GSIZE; | 1024 | g_debbuf->size = CDEBUG_GSIZE; |
| 1025 | g_debbuf->buf[0] = 0; | 1025 | g_debbuf->buf[0] = 0; |
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 7188c59a76f..adb1e8c36b4 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c | |||
| @@ -761,7 +761,7 @@ isdn_getnum(char **p) | |||
| 761 | * Be aware that this is not an atomic operation when sleep != 0, even though | 761 | * Be aware that this is not an atomic operation when sleep != 0, even though |
| 762 | * interrupts are turned off! Well, like that we are currently only called | 762 | * interrupts are turned off! Well, like that we are currently only called |
| 763 | * on behalf of a read system call on raw device files (which are documented | 763 | * on behalf of a read system call on raw device files (which are documented |
| 764 | * to be dangerous and for for debugging purpose only). The inode semaphore | 764 | * to be dangerous and for debugging purpose only). The inode semaphore |
| 765 | * takes care that this is not called for the same minor device number while | 765 | * takes care that this is not called for the same minor device number while |
| 766 | * we are sleeping, but access is not serialized against simultaneous read() | 766 | * we are sleeping, but access is not serialized against simultaneous read() |
| 767 | * from the corresponding ttyI device. Can other ugly events, like changes | 767 | * from the corresponding ttyI device. Can other ugly events, like changes |
| @@ -873,7 +873,7 @@ isdn_readbchan(int di, int channel, u_char * buf, u_char * fp, int len, wait_que | |||
| 873 | * Be aware that this is not an atomic operation when sleep != 0, even though | 873 | * Be aware that this is not an atomic operation when sleep != 0, even though |
| 874 | * interrupts are turned off! Well, like that we are currently only called | 874 | * interrupts are turned off! Well, like that we are currently only called |
| 875 | * on behalf of a read system call on raw device files (which are documented | 875 | * on behalf of a read system call on raw device files (which are documented |
| 876 | * to be dangerous and for for debugging purpose only). The inode semaphore | 876 | * to be dangerous and for debugging purpose only). The inode semaphore |
| 877 | * takes care that this is not called for the same minor device number while | 877 | * takes care that this is not called for the same minor device number while |
| 878 | * we are sleeping, but access is not serialized against simultaneous read() | 878 | * we are sleeping, but access is not serialized against simultaneous read() |
| 879 | * from the corresponding ttyI device. Can other ugly events, like changes | 879 | * from the corresponding ttyI device. Can other ugly events, like changes |