Merge branch 'master' into mixer

This commit is contained in:
Alexandre Ratchov 2017-11-23 07:16:36 +01:00
commit 53d8a7a9f9
1 changed files with 8 additions and 8 deletions

View File

@ -1568,19 +1568,19 @@ found:
if (!dev_ref(d))
return NULL;
dev_label(d, s - d->slot);
if ((mode & d->mode) != mode) {
if (log_level >= 1) {
slot_log(s);
log_puts(": requested mode not supported\n");
}
dev_unref(d);
return 0;
}
s->dev = d;
s->ops = ops;
s->arg = arg;
s->pstate = SLOT_INIT;
s->tstate = MMC_OFF;
if ((mode & s->dev->mode) != mode) {
if (log_level >= 1) {
slot_log(s);
log_puts(": requested mode not supported\n");
}
return 0;
}
s->mode = mode;
aparams_init(&s->par);
if (s->mode & MODE_PLAY) {