Merge "ASoC: msm: Prevent panic while in remove dai links" (e64aefe1) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/qdsp6v2/msm-dai-q6-hdmi-v2.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.		/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License version 2 and		* it under the terms of the GNU General Public License version 2 and
	@@ -306,7 +306,6 @@ static int msm_dai_q6_hdmi_dai_remove(struct snd_soc_dai *dai)
	clear_bit(STATUS_PORT_STARTED, dai_data->status_mask);		clear_bit(STATUS_PORT_STARTED, dai_data->status_mask);
	}		}
	kfree(dai_data);		kfree(dai_data);
	snd_soc_unregister_component(dai->dev);

	return 0;		return 0;
	}		}

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -929,7 +929,6 @@ static int msm_dai_q6_spdif_dai_remove(struct snd_soc_dai *dai)
	clear_bit(STATUS_PORT_STARTED, dai_data->status_mask);		clear_bit(STATUS_PORT_STARTED, dai_data->status_mask);
	}		}
	kfree(dai_data);		kfree(dai_data);
	snd_soc_unregister_component(dai->dev);

	return 0;		return 0;
	}		}
	@@ -1516,7 +1515,6 @@ static int msm_dai_q6_dai_remove(struct snd_soc_dai *dai)
	clear_bit(STATUS_PORT_STARTED, dai_data->status_mask);		clear_bit(STATUS_PORT_STARTED, dai_data->status_mask);
	}		}
	kfree(dai_data);		kfree(dai_data);
	snd_soc_unregister_component(dai->dev);

	return 0;		return 0;
	}		}
	@@ -2421,7 +2419,6 @@ static int msm_dai_q6_dai_mi2s_remove(struct snd_soc_dai *dai)
	mi2s_dai_data->tx_dai.mi2s_dai_data.status_mask);		mi2s_dai_data->tx_dai.mi2s_dai_data.status_mask);
	}		}
	kfree(mi2s_dai_data);		kfree(mi2s_dai_data);
	snd_soc_unregister_component(dai->dev);
	return 0;		return 0;
	}		}