Merge remote-tracking branch 'asoc/topic/x86' into asoc-next

broonie · broonie · commit 84bbc4aa2de9 · 2013-06-17T17:20:33.000+01:00
diff --git a/sound/soc/mid-x86/mfld_machine.c b/sound/soc/mid-x86/mfld_machine.c
@@ -425,7 +425,6 @@ static int snd_mfld_mc_remove(struct platform_device *pdev)
 	free_irq(platform_get_irq(pdev, 0), mc_drv_ctx);
 	snd_soc_unregister_card(&snd_soc_card_mfld);
 	kfree(mc_drv_ctx);
-	platform_set_drvdata(pdev, NULL);
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,6 @@ static int snd_mfld_mc_remove(struct platform_device *pdev)`
`425`	`425`	`free_irq(platform_get_irq(pdev, 0), mc_drv_ctx);`
`426`	`426`	`snd_soc_unregister_card(&snd_soc_card_mfld);`
`427`	`427`	`kfree(mc_drv_ctx);`
`428`		`- platform_set_drvdata(pdev, NULL);`
`429`	`428`	`return 0;`
`430`	`429`	`}`
`431`	`430`