Merge branch 'fix/misc' into topic/misc

This commit is contained in:
Takashi Iwai 2011-09-16 08:29:04 +02:00
commit 0308110615
33 changed files with 222 additions and 120 deletions

View file

@ -1073,10 +1073,10 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
sdev->pcmid = -1;
list_del(&ldev->list);
layouts_list_items--;
kfree(ldev);
outnodev:
of_node_put(sound);
layout_device = NULL;
kfree(ldev);
return -ENODEV;
}