aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-06 12:36:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-06 12:36:28 -0400
commit2e515bf096c245ba87f20ab4b4ea20f911afaeda (patch)
tree8ce40f811092844ea9da683804db6e2afa410808 /sound
parent22e04f6b4b04a8afe9af9239224591d06ba3b24d (diff)
parentf8ea61e63442c25cbe6ddee48979b444f1f2a01c (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina: "The usual trivial updates all over the tree -- mostly typo fixes and documentation updates" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (52 commits) doc: Documentation/cputopology.txt fix typo treewide: Convert retrun typos to return Fix comment typo for init_cma_reserved_pageblock Documentation/trace: Correcting and extending tracepoint documentation mm/hotplug: fix a typo in Documentation/memory-hotplug.txt power: Documentation: Update s2ram link doc: fix a typo in Documentation/00-INDEX Documentation/printk-formats.txt: No casts needed for u64/s64 doc: Fix typo "is is" in Documentations treewide: Fix printks with 0x%# zram: doc fixes Documentation/kmemcheck: update kmemcheck documentation doc: documentation/hwspinlock.txt fix typo PM / Hibernate: add section for resume options doc: filesystems : Fix typo in Documentations/filesystems scsi/megaraid fixed several typos in comments ppc: init_32: Fix error typo "CONFIG_START_KERNEL" treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks page_isolation: Fix a comment typo in test_pages_isolated() doc: fix a typo about irq affinity ...
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/ens1370.c2
-rw-r--r--sound/pci/via82xx.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index ca8929b9a5d6..61262f396004 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -1842,7 +1842,7 @@ static int snd_ensoniq_create_gameport(struct ensoniq *ensoniq, int dev)
1842 1842
1843 default: 1843 default:
1844 if (!request_region(io_port, 8, "ens137x: gameport")) { 1844 if (!request_region(io_port, 8, "ens137x: gameport")) {
1845 printk(KERN_WARNING "ens137x: gameport io port 0x%#x in use\n", 1845 printk(KERN_WARNING "ens137x: gameport io port %#x in use\n",
1846 io_port); 1846 io_port);
1847 return -EBUSY; 1847 return -EBUSY;
1848 } 1848 }
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 3c511d0caf9e..5ae6f042c586 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -1940,7 +1940,7 @@ static int snd_via686_create_gameport(struct via82xx *chip, unsigned char *legac
1940 1940
1941 r = request_region(JOYSTICK_ADDR, 8, "VIA686 gameport"); 1941 r = request_region(JOYSTICK_ADDR, 8, "VIA686 gameport");
1942 if (!r) { 1942 if (!r) {
1943 printk(KERN_WARNING "via82xx: cannot reserve joystick port 0x%#x\n", 1943 printk(KERN_WARNING "via82xx: cannot reserve joystick port %#x\n",
1944 JOYSTICK_ADDR); 1944 JOYSTICK_ADDR);
1945 return -EBUSY; 1945 return -EBUSY;
1946 } 1946 }