diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 18:24:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 18:24:35 -0400 |
commit | 811158b147a503fbdf9773224004ffd32002d1fe (patch) | |
tree | 0a11dcfefe721bfc38ea9f1f4a238822dbae0dda /drivers/isdn | |
parent | 4e76c5ccd5ac9bd003467d3bb0f49b18572dd4cd (diff) | |
parent | b26e0ed4936b743b693a4cc1413561fa3e4eaf65 (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: (28 commits)
trivial: Update my email address
trivial: NULL noise: drivers/mtd/tests/mtd_*test.c
trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h
trivial: Fix misspelling of "Celsius".
trivial: remove unused variable 'path' in alloc_file()
trivial: fix a pdlfush -> pdflush typo in comment
trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL
trivial: wusb: Storage class should be before const qualifier
trivial: drivers/char/bsr.c: Storage class should be before const qualifier
trivial: h8300: Storage class should be before const qualifier
trivial: fix where cgroup documentation is not correctly referred to
trivial: Give the right path in Documentation example
trivial: MTD: remove EOL from MODULE_DESCRIPTION
trivial: Fix typo in bio_split()'s documentation
trivial: PWM: fix of #endif comment
trivial: fix typos/grammar errors in Kconfig texts
trivial: Fix misspelling of firmware
trivial: cgroups: documentation typo and spelling corrections
trivial: Update contact info for Jochen Hein
trivial: fix typo "resgister" -> "register"
...
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/mISDN/Kconfig | 10 | ||||
-rw-r--r-- | drivers/isdn/mISDN/l1oip_codec.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/isdn/mISDN/Kconfig b/drivers/isdn/mISDN/Kconfig index 4938355c4072..1747a02a019a 100644 --- a/drivers/isdn/mISDN/Kconfig +++ b/drivers/isdn/mISDN/Kconfig | |||
@@ -14,13 +14,15 @@ config MISDN_DSP | |||
14 | depends on MISDN | 14 | depends on MISDN |
15 | help | 15 | help |
16 | Enable support for digital audio processing capability. | 16 | Enable support for digital audio processing capability. |
17 | |||
17 | This module may be used for special applications that require | 18 | This module may be used for special applications that require |
18 | cross connecting of bchannels, conferencing, dtmf decoding | 19 | cross connecting of bchannels, conferencing, dtmf decoding, |
19 | echo cancelation, tone generation, and Blowfish encryption and | 20 | echo cancelation, tone generation, and Blowfish encryption and |
20 | decryption. | 21 | decryption. It may use hardware features if available. |
21 | It may use hardware features if available. | 22 | |
22 | E.g. it is required for PBX4Linux. Go to http://isdn.eversberg.eu | 23 | E.g. it is required for PBX4Linux. Go to http://isdn.eversberg.eu |
23 | and get more informations about this module and it's usage. | 24 | and get more information about this module and its usage. |
25 | |||
24 | If unsure, say 'N'. | 26 | If unsure, say 'N'. |
25 | 27 | ||
26 | config MISDN_L1OIP | 28 | config MISDN_L1OIP |
diff --git a/drivers/isdn/mISDN/l1oip_codec.c b/drivers/isdn/mISDN/l1oip_codec.c index 2ec4b28d9edc..e4ecba3d48df 100644 --- a/drivers/isdn/mISDN/l1oip_codec.c +++ b/drivers/isdn/mISDN/l1oip_codec.c | |||
@@ -331,7 +331,7 @@ l1oip_4bit_alloc(int ulaw) | |||
331 | /* alloc conversion tables */ | 331 | /* alloc conversion tables */ |
332 | table_com = vmalloc(65536); | 332 | table_com = vmalloc(65536); |
333 | table_dec = vmalloc(512); | 333 | table_dec = vmalloc(512); |
334 | if (!table_com | !table_dec) { | 334 | if (!table_com || !table_dec) { |
335 | l1oip_4bit_free(); | 335 | l1oip_4bit_free(); |
336 | return -ENOMEM; | 336 | return -ENOMEM; |
337 | } | 337 | } |