Merge "ALSA: compress: Memset timestamp structure to zero." (355bc4d7) · Commits · e / devices / android_kernel_sony_msm8994

sound/core/compress_offload.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -613,9 +613,10 @@ snd_compr_set_metadata(struct snd_compr_stream *stream, unsigned long arg)
	static inline int		static inline int
	snd_compr_tstamp(struct snd_compr_stream *stream, unsigned long arg)		snd_compr_tstamp(struct snd_compr_stream *stream, unsigned long arg)
	{		{
	struct snd_compr_tstamp tstamp = {0};		struct snd_compr_tstamp tstamp;
	int ret;		int ret;

			memset(&tstamp, 0, sizeof(tstamp));
	ret = snd_compr_update_tstamp(stream, &tstamp);		ret = snd_compr_update_tstamp(stream, &tstamp);
	if (ret == 0)		if (ret == 0)
	ret = copy_to_user((struct snd_compr_tstamp __user *)arg,		ret = copy_to_user((struct snd_compr_tstamp __user *)arg,