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
872d65f6
Commit
872d65f6
authored
Apr 16, 2010
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/misc' into for-linus
parents
d336905e
b68b58fd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
8 deletions
+23
-8
sound/arm/aaci.c
sound/arm/aaci.c
+5
-2
sound/usb/usbmidi.c
sound/usb/usbmidi.c
+18
-6
No files found.
sound/arm/aaci.c
View file @
872d65f6
...
...
@@ -863,7 +863,6 @@ static int __devinit aaci_probe_ac97(struct aaci *aaci)
struct
snd_ac97
*
ac97
;
int
ret
;
writel
(
0
,
aaci
->
base
+
AC97_POWERDOWN
);
/*
* Assert AACIRESET for 2us
*/
...
...
@@ -1047,7 +1046,11 @@ static int __devinit aaci_probe(struct amba_device *dev, struct amba_id *id)
writel
(
0x1fff
,
aaci
->
base
+
AACI_INTCLR
);
writel
(
aaci
->
maincr
,
aaci
->
base
+
AACI_MAINCR
);
/*
* Fix: ac97 read back fail errors by reading
* from any arbitrary aaci register.
*/
readl
(
aaci
->
base
+
AACI_CSCH1
);
ret
=
aaci_probe_ac97
(
aaci
);
if
(
ret
)
goto
out
;
...
...
sound/usb/usbmidi.c
View file @
872d65f6
...
...
@@ -986,6 +986,8 @@ static void snd_usbmidi_output_drain(struct snd_rawmidi_substream *substream)
DEFINE_WAIT
(
wait
);
long
timeout
=
msecs_to_jiffies
(
50
);
if
(
ep
->
umidi
->
disconnected
)
return
;
/*
* The substream buffer is empty, but some data might still be in the
* currently active URBs, so we have to wait for those to complete.
...
...
@@ -1123,14 +1125,21 @@ static int snd_usbmidi_in_endpoint_create(struct snd_usb_midi* umidi,
* Frees an output endpoint.
* May be called when ep hasn't been initialized completely.
*/
static
void
snd_usbmidi_out_endpoint_
delete
(
struct
snd_usb_midi_out_endpoint
*
ep
)
static
void
snd_usbmidi_out_endpoint_
clear
(
struct
snd_usb_midi_out_endpoint
*
ep
)
{
unsigned
int
i
;
for
(
i
=
0
;
i
<
OUTPUT_URBS
;
++
i
)
if
(
ep
->
urbs
[
i
].
urb
)
if
(
ep
->
urbs
[
i
].
urb
)
{
free_urb_and_buffer
(
ep
->
umidi
,
ep
->
urbs
[
i
].
urb
,
ep
->
max_transfer
);
ep
->
urbs
[
i
].
urb
=
NULL
;
}
}
static
void
snd_usbmidi_out_endpoint_delete
(
struct
snd_usb_midi_out_endpoint
*
ep
)
{
snd_usbmidi_out_endpoint_clear
(
ep
);
kfree
(
ep
);
}
...
...
@@ -1262,15 +1271,18 @@ void snd_usbmidi_disconnect(struct list_head* p)
usb_kill_urb
(
ep
->
out
->
urbs
[
j
].
urb
);
if
(
umidi
->
usb_protocol_ops
->
finish_out_endpoint
)
umidi
->
usb_protocol_ops
->
finish_out_endpoint
(
ep
->
out
);
ep
->
out
->
active_urbs
=
0
;
if
(
ep
->
out
->
drain_urbs
)
{
ep
->
out
->
drain_urbs
=
0
;
wake_up
(
&
ep
->
out
->
drain_wait
);
}
}
if
(
ep
->
in
)
for
(
j
=
0
;
j
<
INPUT_URBS
;
++
j
)
usb_kill_urb
(
ep
->
in
->
urbs
[
j
]);
/* free endpoints here; later call can result in Oops */
if
(
ep
->
out
)
{
snd_usbmidi_out_endpoint_delete
(
ep
->
out
);
ep
->
out
=
NULL
;
}
if
(
ep
->
out
)
snd_usbmidi_out_endpoint_clear
(
ep
->
out
);
if
(
ep
->
in
)
{
snd_usbmidi_in_endpoint_delete
(
ep
->
in
);
ep
->
in
=
NULL
;
...
...
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