Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
f6450739
Commit
f6450739
authored
Nov 08, 2009
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/misc' into for-linus
parents
6fc786d5
f37325a9
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
5 deletions
+14
-5
sound/oss/dmasound/dmasound_core.c
sound/oss/dmasound/dmasound_core.c
+3
-1
sound/oss/sb_common.c
sound/oss/sb_common.c
+2
-2
sound/oss/sb_ess.c
sound/oss/sb_ess.c
+1
-1
sound/pci/intel8x0.c
sound/pci/intel8x0.c
+6
-0
sound/sh/aica.c
sound/sh/aica.c
+1
-0
sound/usb/usbaudio.h
sound/usb/usbaudio.h
+1
-1
No files found.
sound/oss/dmasound/dmasound_core.c
View file @
f6450739
...
...
@@ -219,7 +219,9 @@ static int shared_resources_initialised;
* Mid level stuff
*/
struct
sound_settings
dmasound
=
{
.
lock
=
SPIN_LOCK_UNLOCKED
};
struct
sound_settings
dmasound
=
{
.
lock
=
__SPIN_LOCK_UNLOCKED
(
dmasound
.
lock
)
};
static
inline
void
sound_silence
(
void
)
{
...
...
sound/oss/sb_common.c
View file @
f6450739
...
...
@@ -157,7 +157,7 @@ static void sb_intr (sb_devc *devc)
break
;
default:
/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
/* printk(KERN_WARN
ING
"Sound Blaster: Unexpected interrupt\n"); */
;
}
}
...
...
@@ -177,7 +177,7 @@ static void sb_intr (sb_devc *devc)
break
;
default:
/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
/* printk(KERN_WARN
ING
"Sound Blaster: Unexpected interrupt\n"); */
;
}
}
...
...
sound/oss/sb_ess.c
View file @
f6450739
...
...
@@ -782,7 +782,7 @@ printk(KERN_INFO "FKS: ess_handle_channel %s irq_mode=%d\n", channel, irq_mode);
break
;
default:
;
/* printk(KERN_WARN "ESS: Unexpected interrupt\n"); */
/* printk(KERN_WARN
ING
"ESS: Unexpected interrupt\n"); */
}
}
...
...
sound/pci/intel8x0.c
View file @
f6450739
...
...
@@ -1948,6 +1948,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
.
name
=
"HP xw4200"
,
/* AD1981B*/
.
type
=
AC97_TUNE_HP_ONLY
},
{
.
subvendor
=
0x104d
,
.
subdevice
=
0x8144
,
.
name
=
"Sony"
,
.
type
=
AC97_TUNE_INV_EAPD
},
{
.
subvendor
=
0x104d
,
.
subdevice
=
0x8197
,
...
...
sound/sh/aica.c
View file @
f6450739
...
...
@@ -49,6 +49,7 @@ MODULE_AUTHOR("Adrian McMenamin <adrian@mcmen.demon.co.uk>");
MODULE_DESCRIPTION
(
"Dreamcast AICA sound (pcm) driver"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_SUPPORTED_DEVICE
(
"{{Yamaha/SEGA, AICA}}"
);
MODULE_FIRMWARE
(
"aica_firmware.bin"
);
/* module parameters */
#define CARD_NAME "AICA"
...
...
sound/usb/usbaudio.h
View file @
f6450739
...
...
@@ -210,7 +210,7 @@ struct snd_usb_midi_endpoint_info {
/*
*/
#define combine_word(s) ((*
s
) | ((unsigned int)(s)[1] << 8))
#define combine_word(s) ((*
(s)
) | ((unsigned int)(s)[1] << 8))
#define combine_triple(s) (combine_word(s) | ((unsigned int)(s)[2] << 16))
#define combine_quad(s) (combine_triple(s) | ((unsigned int)(s)[3] << 24))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment