Fixed missing initialization

This commit is contained in:
Abramo Bagnara 2001-05-19 20:41:25 +00:00
parent 1d9bf33550
commit ecfec483a8

View file

@ -94,11 +94,15 @@ int snd_rawmidi_open(snd_rawmidi_t **inputp, snd_rawmidi_t **outputp,
if (err < 0 || snd_config_get_string(rawmidi_conf, &name1) >= 0) { if (err < 0 || snd_config_get_string(rawmidi_conf, &name1) >= 0) {
int card, dev, subdev; int card, dev, subdev;
err = sscanf(name1, "hw:%d,%d,%d", &card, &dev, &subdev); err = sscanf(name1, "hw:%d,%d,%d", &card, &dev, &subdev);
if (err == 3) if (err == 3) {
return snd_rawmidi_hw_open(inputp, outputp, name, card, dev, subdev, mode); err = snd_rawmidi_hw_open(inputp, outputp, name, card, dev, subdev, mode);
goto _init;
}
err = sscanf(name1, "hw:%d,%d", &card, &dev); err = sscanf(name1, "hw:%d,%d", &card, &dev);
if (err == 2) if (err == 2) {
return snd_rawmidi_hw_open(inputp, outputp, name, card, dev, -1, mode); err = snd_rawmidi_hw_open(inputp, outputp, name, card, dev, -1, mode);
goto _init;
}
SNDERR("Unknown RAWMIDI %s", name1); SNDERR("Unknown RAWMIDI %s", name1);
return -ENOENT; return -ENOENT;
} }
@ -161,6 +165,7 @@ int snd_rawmidi_open(snd_rawmidi_t **inputp, snd_rawmidi_t **outputp,
return -ENXIO; return -ENXIO;
} }
err = open_func(inputp, outputp, name, rawmidi_conf, mode); err = open_func(inputp, outputp, name, rawmidi_conf, mode);
_init:
if (err < 0) if (err < 0)
return err; return err;
if (inputp) { if (inputp) {