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

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

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

parents 4cf9159e 29ca9c73

sound/soc/samsung/i2s.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1068,7 +1068,7 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec) 
		dev_set_drvdata(&i2s->pdev->dev, i2s);

		dev_set_drvdata(&i2s->pdev->dev, i2s);

	} else {	/* Create a new platform_device for Secondary */

	} else {	/* Create a new platform_device for Secondary */

		i2s->pdev = platform_device_alloc("samsung-i2s-sec", -1);

		i2s->pdev = platform_device_alloc("samsung-i2s-sec", -1);

		if (IS_ERR(i2s->pdev))

		if (!i2s->pdev)

			return NULL;

			return NULL;





		i2s->pdev->dev.parent = &pdev->dev;

		i2s->pdev->dev.parent = &pdev->dev;