Merge branch 'for-linus' into for-next

1 files changed, 4 insertions, 2 deletions

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index b329ca58e63c..c76f6375a96b 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -2124,7 +2124,8 @@ static int snd_pcm_playback_open(struct inode *inode, struct file *file)
         pcm = snd_lookup_minor_data(iminor(inode),
                                     SNDRV_DEVICE_TYPE_PCM_PLAYBACK);
         err = snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_PLAYBACK);
-        snd_card_unref(pcm->card);
+        if (pcm)
+                snd_card_unref(pcm->card);
         return err;
 }
 
@@ -2137,7 +2138,8 @@ static int snd_pcm_capture_open(struct inode *inode, struct file *file)
         pcm = snd_lookup_minor_data(iminor(inode),
                                     SNDRV_DEVICE_TYPE_PCM_CAPTURE);
         err = snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_CAPTURE);
-        snd_card_unref(pcm->card);
+        if (pcm)
+                snd_card_unref(pcm->card);
         return err;
 }