Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0427428 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/rsnd' into asoc-linus

parents a9ca2a3c 0b1f6ec7

sound/soc/sh/rcar/core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1252,6 +1252,8 @@ static int rsnd_probe(struct platform_device *pdev) 
			goto exit_snd_probe;

			goto exit_snd_probe;

	}

	}





	dev_set_drvdata(dev, priv);



	/*

	/*

	 *	asoc register

	 *	asoc register

	 */

	 */
@@ -1268,8 +1270,6 @@ static int rsnd_probe(struct platform_device *pdev) 
		goto exit_snd_soc;

		goto exit_snd_soc;

	}

	}





	dev_set_drvdata(dev, priv);



	pm_runtime_enable(dev);

	pm_runtime_enable(dev);





	dev_info(dev, "probed\n");

	dev_info(dev, "probed\n");