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

Commit 69c90cf1 authored by Christian Gromm's avatar Christian Gromm Committed by Greg Kroah-Hartman
Browse files

staging: most: sound: call snd_card_new with struct device 



This patch is needed as function snd_card_new needs a valid
parent device. Passing a NULL pointer leads to kernel Ooops.

Signed-off-by: default avatarChristian Gromm <christian.gromm@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3598cec5

drivers/staging/most/core.h

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ struct mbo { 
 */

struct most_interface {

	struct device dev;

	struct device *driver_dev;

	struct module *mod;

	enum most_interface_type interface;

	const char *description;

drivers/staging/most/sound/sound.c

+1 −1
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ static int audio_probe_channel(struct most_interface *iface, int channel_id, 
	if (ret < 0)

		return ret;



	ret = snd_card_new(NULL, -1, card_name, THIS_MODULE,

	ret = snd_card_new(&iface->dev, -1, card_name, THIS_MODULE,

			   sizeof(*channel), &card);

	if (ret < 0)

		return ret;

drivers/staging/most/usb/usb.c

+1 −0
Original line number Diff line number Diff line
@@ -1043,6 +1043,7 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id) 
	mdev->link_stat_timer.expires = jiffies + (2 * HZ);



	mdev->iface.mod = hdm_usb_fops.owner;

	mdev->iface.driver_dev = &interface->dev;

	mdev->iface.interface = ITYPE_USB;

	mdev->iface.configure = hdm_configure_channel;

	mdev->iface.request_netinfo = hdm_request_netinfo;