From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 4 Apr 2016 09:51:08 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a99e31512aa435e8391ba5f5e64abeac9c5f2f32;p=linux-beck.git

Merge branch 'for-linus' into for-next

Conflicts:
	sound/hda/hdac_i915.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

a99e31512aa435e8391ba5f5e64abeac9c5f2f32
diff --cc sound/hda/hdac_i915.c
index d0da2508823e,54babe1c0b16..6800e0c5a38f
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@@ -306,9 -298,9 +318,12 @@@ int snd_hdac_i915_init(struct hdac_bus 
  	struct i915_audio_component *acomp;
  	int ret;
  
 +	if (WARN_ON(hdac_acomp))
 +		return -EBUSY;
 +
+ 	if (!i915_gfx_present())
+ 		return -ENODEV;
+ 
  	acomp = kzalloc(sizeof(*acomp), GFP_KERNEL);
  	if (!acomp)
  		return -ENOMEM;