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
Kirill Smelkov
linux
Commits
1f26cb92
Commit
1f26cb92
authored
Dec 21, 2009
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/misc' into for-linus
parents
2c3b9b50
db8cf334
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
73 additions
and
132 deletions
+73
-132
sound/arm/aaci.c
sound/arm/aaci.c
+59
-118
sound/arm/aaci.h
sound/arm/aaci.h
+1
-1
sound/core/pcm_lib.c
sound/core/pcm_lib.c
+2
-2
sound/isa/msnd/msnd_midi.c
sound/isa/msnd/msnd_midi.c
+1
-1
sound/isa/sb/emu8000.c
sound/isa/sb/emu8000.c
+3
-3
sound/mips/sgio2audio.c
sound/mips/sgio2audio.c
+1
-1
sound/oss/pss.c
sound/oss/pss.c
+3
-3
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_realtek.c
+1
-1
sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
+1
-1
sound/usb/usbaudio.c
sound/usb/usbaudio.c
+1
-1
No files found.
sound/arm/aaci.c
View file @
1f26cb92
This diff is collapsed.
Click to expand it.
sound/arm/aaci.h
View file @
1f26cb92
...
...
@@ -202,6 +202,7 @@
struct
aaci_runtime
{
void
__iomem
*
base
;
void
__iomem
*
fifo
;
spinlock_t
lock
;
struct
ac97_pcm
*
pcm
;
int
pcm_open
;
...
...
@@ -232,7 +233,6 @@ struct aaci {
struct
snd_ac97
*
ac97
;
u32
maincr
;
spinlock_t
lock
;
struct
aaci_runtime
playback
;
struct
aaci_runtime
capture
;
...
...
sound/core/pcm_lib.c
View file @
1f26cb92
...
...
@@ -758,7 +758,7 @@ int snd_interval_ratnum(struct snd_interval *i,
int
diff
;
if
(
q
==
0
)
q
=
1
;
den
=
div_
down
(
num
,
q
);
den
=
div_
up
(
num
,
q
);
if
(
den
<
rats
[
k
].
den_min
)
continue
;
if
(
den
>
rats
[
k
].
den_max
)
...
...
@@ -794,7 +794,7 @@ int snd_interval_ratnum(struct snd_interval *i,
i
->
empty
=
1
;
return
-
EINVAL
;
}
den
=
div_
up
(
num
,
q
);
den
=
div_
down
(
num
,
q
);
if
(
den
>
rats
[
k
].
den_max
)
continue
;
if
(
den
<
rats
[
k
].
den_min
)
...
...
sound/isa/msnd/msnd_midi.c
View file @
1f26cb92
...
...
@@ -162,7 +162,7 @@ int snd_msndmidi_new(struct snd_card *card, int device)
err
=
snd_rawmidi_new
(
card
,
"MSND-MIDI"
,
device
,
1
,
1
,
&
rmidi
);
if
(
err
<
0
)
return
err
;
mpu
=
k
calloc
(
1
,
sizeof
(
*
mpu
),
GFP_KERNEL
);
mpu
=
k
zalloc
(
sizeof
(
*
mpu
),
GFP_KERNEL
);
if
(
mpu
==
NULL
)
{
snd_device_free
(
card
,
rmidi
);
return
-
ENOMEM
;
...
...
sound/isa/sb/emu8000.c
View file @
1f26cb92
...
...
@@ -393,8 +393,6 @@ size_dram(struct snd_emu8000 *emu)
while
(
size
<
EMU8000_MAX_DRAM
)
{
size
+=
512
*
1024
;
/* increment 512kbytes */
/* Write a unique data on the test address.
* if the address is out of range, the data is written on
* 0x200000(=EMU8000_DRAM_OFFSET). Then the id word is
...
...
@@ -414,7 +412,9 @@ size_dram(struct snd_emu8000 *emu)
/*snd_emu8000_read_wait(emu);*/
EMU8000_SMLD_READ
(
emu
);
/* discard stale data */
if
(
EMU8000_SMLD_READ
(
emu
)
!=
UNIQUE_ID2
)
break
;
/* we must have wrapped around */
break
;
/* no memory at this address */
size
+=
512
*
1024
;
/* increment 512kbytes */
snd_emu8000_read_wait
(
emu
);
...
...
sound/mips/sgio2audio.c
View file @
1f26cb92
...
...
@@ -609,7 +609,7 @@ static int snd_sgio2audio_pcm_hw_params(struct snd_pcm_substream *substream,
/* alloc virtual 'dma' area */
if
(
runtime
->
dma_area
)
vfree
(
runtime
->
dma_area
);
runtime
->
dma_area
=
vmalloc
(
size
);
runtime
->
dma_area
=
vmalloc
_user
(
size
);
if
(
runtime
->
dma_area
==
NULL
)
return
-
ENOMEM
;
runtime
->
dma_bytes
=
size
;
...
...
sound/oss/pss.c
View file @
1f26cb92
...
...
@@ -269,7 +269,7 @@ static int pss_reset_dsp(pss_confdata * devc)
unsigned
long
i
,
limit
=
jiffies
+
HZ
/
10
;
outw
(
0x2000
,
REG
(
PSS_CONTROL
));
for
(
i
=
0
;
i
<
32768
&&
(
limit
-
jiffies
>=
0
);
i
++
)
for
(
i
=
0
;
i
<
32768
&&
time_after_eq
(
limit
,
jiffies
);
i
++
)
inw
(
REG
(
PSS_CONTROL
));
outw
(
0x0000
,
REG
(
PSS_CONTROL
));
return
1
;
...
...
@@ -369,11 +369,11 @@ static int pss_download_boot(pss_confdata * devc, unsigned char *block, int size
outw
(
0
,
REG
(
PSS_DATA
));
limit
=
jiffies
+
HZ
/
10
;
for
(
i
=
0
;
i
<
32768
&&
(
limit
-
jiffies
>=
0
);
i
++
)
for
(
i
=
0
;
i
<
32768
&&
time_after_eq
(
limit
,
jiffies
);
i
++
)
val
=
inw
(
REG
(
PSS_STATUS
));
limit
=
jiffies
+
HZ
/
10
;
for
(
i
=
0
;
i
<
32768
&&
(
limit
-
jiffies
>=
0
);
i
++
)
for
(
i
=
0
;
i
<
32768
&&
time_after_eq
(
limit
,
jiffies
);
i
++
)
{
val
=
inw
(
REG
(
PSS_STATUS
));
if
(
val
&
0x4000
)
...
...
sound/pci/hda/patch_realtek.c
View file @
1f26cb92
...
...
@@ -12924,7 +12924,7 @@ static int patch_alc268(struct hda_codec *codec)
int
board_config
;
int
i
,
has_beep
,
err
;
spec
=
k
calloc
(
1
,
sizeof
(
*
spec
),
GFP_KERNEL
);
spec
=
k
zalloc
(
sizeof
(
*
spec
),
GFP_KERNEL
);
if
(
spec
==
NULL
)
return
-
ENOMEM
;
...
...
sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
View file @
1f26cb92
...
...
@@ -51,7 +51,7 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs, size_t s
return
0
;
/* already enough large */
vfree
(
runtime
->
dma_area
);
}
runtime
->
dma_area
=
vmalloc_32
(
size
);
runtime
->
dma_area
=
vmalloc_32
_user
(
size
);
if
(
!
runtime
->
dma_area
)
return
-
ENOMEM
;
runtime
->
dma_bytes
=
size
;
...
...
sound/usb/usbaudio.c
View file @
1f26cb92
...
...
@@ -752,7 +752,7 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs, size_t s
return
0
;
/* already large enough */
vfree
(
runtime
->
dma_area
);
}
runtime
->
dma_area
=
vmalloc
(
size
);
runtime
->
dma_area
=
vmalloc
_user
(
size
);
if
(
!
runtime
->
dma_area
)
return
-
ENOMEM
;
runtime
->
dma_bytes
=
size
;
...
...
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