Merge "ASoC: qdsp6v2: prevent null pointer dereference for _vol_cmds" into msm-4.9

sound/soc/msm/qdsp6v2/msm-dts-eagle.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -236,7 +236,8 @@ static s32 _volume_cmds_alloc1(s32 size)
		if (_vol_cmds) {
		_vol_cmds_d = kzalloc(_vol_cmd_cnt * sizeof(struct vol_cmds_d),
		GFP_KERNEL);
		}
		} else
		_vol_cmd_cnt = 0;
		if (_vol_cmds_d)
		return 0;
		_volume_cmds_free();