Merge branch 'topic/ctl-add-remove-fixes' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 10 Sep 2009 13:32:47 +0000 (15:32 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 10 Sep 2009 13:32:47 +0000 (15:32 +0200)
commitf604529d0c1c24be025f47b591366e257ee75f66
tree22f09696a541cb561e33e352e47259ff492261a6
parent124e39b34d9b38cde4cac02077d5b58f6c1f063e
parent18dd0aa5afea7dc33953aa87de696e39074bbf78
Merge branch 'topic/ctl-add-remove-fixes' into for-linus

* topic/ctl-add-remove-fixes:
  sound: snd_ctl_remove_user_ctl: prevent removal of kernel controls
  sound: snd_ctl_remove_unlocked_id: simplify user control counting
  sound: snd_ctl_remove_unlocked_id: simplify error paths
  sound: snd_ctl_elem_add: fix value count check