Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86b3aa39 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/ca0106' into to-push

parents e4456e71 ebef7cfc

include/sound/core.h

+25 −3
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...) 
 * snd_printk - printk wrapper

 * @fmt: format string

 *

 * Works like print() but prints the file and the line of the caller

 * Works like printk() but prints the file and the line of the caller

 * when configured with CONFIG_SND_VERBOSE_PRINTK.

 */

#define snd_printk(fmt, args...) \
@@ -380,18 +380,40 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...) 
	printk(fmt ,##args)

#endif



/**

 * snd_BUG - give a BUG warning message and stack trace

 *

 * Calls WARN() if CONFIG_SND_DEBUG is set.

 * Ignored when CONFIG_SND_DEBUG is not set.

 */

#define snd_BUG()		WARN(1, "BUG?\n")



/**

 * snd_BUG_ON - debugging check macro

 * @cond: condition to evaluate

 *

 * When CONFIG_SND_DEBUG is set, this macro evaluates the given condition,

 * and call WARN() and returns the value if it's non-zero.

 * 

 * When CONFIG_SND_DEBUG is not set, this just returns zero, and the given

 * condition is ignored.

 *

 * NOTE: the argument won't be evaluated at all when CONFIG_SND_DEBUG=n.

 * Thus, don't put any statement that influences on the code behavior,

 * such as pre/post increment, to the argument of this macro.

 * If you want to evaluate and give a warning, use standard WARN_ON().

 */

#define snd_BUG_ON(cond)	WARN((cond), "BUG? (%s)\n", __stringify(cond))



#else /* !CONFIG_SND_DEBUG */



#define snd_printd(fmt, args...)	do { } while (0)

#define snd_BUG()			do { } while (0)

static inline int __snd_bug_on(void)

static inline int __snd_bug_on(int cond)

{

	return 0;

}

#define snd_BUG_ON(cond)		__snd_bug_on()  /* always false */

#define snd_BUG_ON(cond)	__snd_bug_on(0 && (cond))  /* always false */



#endif /* CONFIG_SND_DEBUG */

include/sound/version.h

+1 −1
Original line number Diff line number Diff line 
/* include/version.h */

#define CONFIG_SND_VERSION "1.0.18rc3"

#define CONFIG_SND_VERSION "1.0.18a"

#define CONFIG_SND_DATE ""

sound/ac97_bus.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/init.h>

#include <linux/device.h>

#include <linux/string.h>

#include <sound/ac97_codec.h>



/*

 * Let drivers decide whether they want to support given codec from their

sound/core/device.c

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ int snd_device_free(struct snd_card *card, void *device_data) 
		kfree(dev);

		return 0;

	}

	snd_printd("device free %p (from %p), not found\n", device_data,

	snd_printd("device free %p (from %pF), not found\n", device_data,

		   __builtin_return_address(0));

	return -ENXIO;

}
@@ -135,7 +135,7 @@ int snd_device_disconnect(struct snd_card *card, void *device_data) 
		}

		return 0;

	}

	snd_printd("device disconnect %p (from %p), not found\n", device_data,

	snd_printd("device disconnect %p (from %pF), not found\n", device_data,

		   __builtin_return_address(0));

	return -ENXIO;

}

sound/drivers/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ config SND_ML403_AC97CR 


config SND_AC97_POWER_SAVE

	bool "AC97 Power-Saving Mode"

	depends on SND_AC97_CODEC && EXPERIMENTAL

	depends on SND_AC97_CODEC

	default n

	help

	  Say Y here to enable the aggressive power-saving support of