Commit 5bd9c696 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus

parents 8f55c1e5 19b3f316

sound/soc/omap/omap-pcm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -233,7 +233,7 @@ static int omap_pcm_open(struct snd_pcm_substream *substream) 
	if (ret < 0)

	if (ret < 0)

		goto out;

		goto out;





	prtd = kzalloc(sizeof(prtd), GFP_KERNEL);

	prtd = kzalloc(sizeof(*prtd), GFP_KERNEL);

	if (prtd == NULL) {

	if (prtd == NULL) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto out;

		goto out;