Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 206655
b: refs/heads/master
c: 21af7d8
h: refs/heads/master
i:
  206653: 5294cb4
  206651: 6553330
  206647: 8c4edee
  206639: 768df51
  206623: d2a38ce
  206591: 4b2a770
v: v3
  • Loading branch information
Daniel Mack authored and Takashi Iwai committed Jun 23, 2010
1 parent 8bb73ce commit f3855c3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 69da9bcb98ccbfb5d5f751bc13418f1307332925
refs/heads/master: 21af7d8c0c0a88f6f9fc6993d73001b4caf23b08
14 changes: 7 additions & 7 deletions trunk/sound/usb/midi.c
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ static void snd_usbmidi_maudio_broken_running_status_input(
u8 cin = buffer[i] & 0x0f;
struct usbmidi_in_port *port = &ep->ports[cable];
int length;

length = snd_usbmidi_cin_length[cin];
if (cin == 0xf && buffer[i + 1] >= 0xf8)
; /* realtime msg: no running status change */
Expand Down Expand Up @@ -628,13 +628,13 @@ static struct usb_protocol_ops snd_usbmidi_standard_ops = {

static struct usb_protocol_ops snd_usbmidi_midiman_ops = {
.input = snd_usbmidi_midiman_input,
.output = snd_usbmidi_standard_output,
.output = snd_usbmidi_standard_output,
.output_packet = snd_usbmidi_output_midiman_packet,
};

static struct usb_protocol_ops snd_usbmidi_maudio_broken_running_status_ops = {
.input = snd_usbmidi_maudio_broken_running_status_input,
.output = snd_usbmidi_standard_output,
.output = snd_usbmidi_standard_output,
.output_packet = snd_usbmidi_output_standard_packet,
};

Expand Down Expand Up @@ -1248,7 +1248,7 @@ static void snd_usbmidi_out_endpoint_delete(struct snd_usb_midi_out_endpoint *ep
*/
static int snd_usbmidi_out_endpoint_create(struct snd_usb_midi* umidi,
struct snd_usb_midi_endpoint_info* ep_info,
struct snd_usb_midi_endpoint* rep)
struct snd_usb_midi_endpoint* rep)
{
struct snd_usb_midi_out_endpoint* ep;
unsigned int i;
Expand Down Expand Up @@ -1398,7 +1398,7 @@ static void snd_usbmidi_rawmidi_free(struct snd_rawmidi *rmidi)
}

static struct snd_rawmidi_substream *snd_usbmidi_find_substream(struct snd_usb_midi* umidi,
int stream, int number)
int stream, int number)
{
struct list_head* list;

Expand Down Expand Up @@ -1811,7 +1811,7 @@ static int snd_usbmidi_detect_endpoints(struct snd_usb_midi* umidi,
snd_usbmidi_switch_roland_altsetting(umidi);

if (endpoint[0].out_ep || endpoint[0].in_ep)
return 0;
return 0;

intf = umidi->iface;
if (!intf || intf->num_altsetting < 1)
Expand Down Expand Up @@ -1849,7 +1849,7 @@ static int snd_usbmidi_detect_per_port_endpoints(struct snd_usb_midi* umidi,
struct snd_usb_midi_endpoint_info* endpoints)
{
int err, i;

err = snd_usbmidi_detect_endpoints(umidi, endpoints, MIDI_MAX_ENDPOINTS);
for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i) {
if (endpoints[i].out_ep)
Expand Down

0 comments on commit f3855c3

Please sign in to comment.