From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 10 Sep 2009 13:32:47 +0000 (+0200)
Subject: Merge branch 'topic/ctl-add-remove-fixes' into for-linus
X-Git-Tag: v2.6.32-rc3~9^2~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f604529d0c1c24be025f47b591366e257ee75f66;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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
---

f604529d0c1c24be025f47b591366e257ee75f66