Merge "usb: gadget: f_uac2: Fix sound card registration failure" (7b732344) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/gadget/function/f_uac2.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -134,6 +134,7 @@ struct audio_dev {

		/* The ALSA Sound Card it represents on the USB-Client side */
		struct snd_uac2_chip uac2;
		struct device *gdev;
		};

		static inline
		@@ -463,7 +464,7 @@ static int snd_uac2_probe(struct platform_device *pdev)
		c_chmask = opts->c_chmask;

		/* Choose any slot, with no id */
		err = snd_card_new(&pdev->dev, -1, NULL, THIS_MODULE, 0, &card);
		err = snd_card_new(audio_dev->gdev, -1, NULL, THIS_MODULE, 0, &card);
		if (err < 0)
		return err;

		@@ -1237,6 +1238,7 @@ afunc_bind(struct usb_configuration cfg, struct usb_function fn)
		goto err;
		}

		agdev->gdev = &gadget->dev;
		ret = alsa_uac2_init(agdev);
		if (ret)
		goto err;