Skip to content

L
linux-davinci
Commit d2f57cd5 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'fix/hda' into topic/hda

parents 7e0e44d4 55290e19
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
sound/pci/hda/hda_hwdep.c
View file @ d2f57cd5
...@@ -277,18 +277,19 @@ static ssize_t init_verbs_store(struct device *dev, ...@@ -277,18 +277,19 @@ static ssize_t init_verbs_store(struct device *dev,
{ {
struct snd_hwdep *hwdep = dev_get_drvdata(dev); struct snd_hwdep *hwdep = dev_get_drvdata(dev);
struct hda_codec *codec = hwdep->private_data; struct hda_codec *codec = hwdep->private_data;
char *p; struct hda_verb *v;
struct hda_verb verb, *v; int nid, verb, param;
verb.nid = simple_strtoul(buf, &p, 0); if (sscanf(buf, "%i %i %i", &nid, &verb, &param) != 3)
verb.verb = simple_strtoul(p, &p, 0); return -EINVAL;
verb.param = simple_strtoul(p, &p, 0); if (!nid || !verb)
if (!verb.nid || !verb.verb || !verb.param)
return -EINVAL; return -EINVAL;
v = snd_array_new(&codec->init_verbs); v = snd_array_new(&codec->init_verbs);
if (!v) if (!v)
return -ENOMEM; return -ENOMEM;
*v = verb; v->nid = nid;
v->verb = verb;
v->param = param;
return count; return count;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment