video/rockchip: rga2: fix compilation warning

[firefly-linux-kernel-4.4.55.git] / sound / core / control.c

diff --git a/sound/core/control.c b/sound/core/control.c
index 196a6fe100ca8f40cc7f9b01eb00dc81c713ba93..b4fe9b00251251d596fbfbce2dd87eb44841b917 100644 (file)
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -160,6 +160,8 @@ void snd_ctl_notify(struct snd_card *card, unsigned int mask,
        
        if (snd_BUG_ON(!card || !id))
                return;
+       if (card->shutdown)
+               return;
        read_lock(&card->ctl_files_rwlock);
 #if IS_ENABLED(CONFIG_SND_MIXER_OSS)
        card->mixer_oss_change_count++;
@@ -1405,6 +1407,8 @@ static int snd_ctl_tlv_ioctl(struct snd_ctl_file *file,
                return -EFAULT;
        if (tlv.length < sizeof(unsigned int) * 2)
                return -EINVAL;
+       if (!tlv.numid)
+               return -EINVAL;
        down_read(&card->controls_rwsem);
        kctl = snd_ctl_find_numid(card, tlv.numid);
        if (kctl == NULL) {