struct task *t)
{
struct writer_node *wn = container_of(t, struct writer_node, task);
- struct oss_write_args_info *conf = wn->conf;
struct private_oss_write_data *powd = wn->private_data;
struct btr_node *btrn = wn->btrn;
size_t frames, bytes;
return;
if (powd->fd < 0) {
int32_t rate, ch;
- ret = -1;
- if (!conf->sample_rate_given) /* config option trumps btr_exec */
- ret = get_btr_sample_rate(wn->btrn, &rate);
+ ret = get_btr_sample_rate(btrn, &rate);
if (ret < 0)
- rate = conf->sample_rate_arg;
- ret = -1;
- if (!conf->channels_given)
- ret = get_btr_channels(wn->btrn, &ch);
+ goto out;
+ ret = get_btr_channels(btrn, &ch);
if (ret < 0)
- ch = conf->channels_arg;
+ goto out;
ret = oss_init(wn, rate, ch);
if (ret < 0)
goto out;