D56160.id174527.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D56160.id174527.diff
View Options

	diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
	--- a/sys/dev/sound/usb/uaudio.c
	+++ b/sys/dev/sound/usb/uaudio.c
	@@ -367,7 +367,6 @@
	};

	struct uaudio_softc {
	- struct sndcard_func sc_sndcard_func;
	struct uaudio_chan sc_rec_chan[UAUDIO_MAX_CHILD];
	struct uaudio_chan sc_play_chan[UAUDIO_MAX_CHILD];
	struct umidi_chan sc_midi_chan;
	@@ -1112,8 +1111,6 @@

	/* attach the children */

	- sc->sc_sndcard_func.func = SCF_PCM;
	-
	/*
	* Only attach a PCM device if we have a playback, recording
	* or mixer device present:
	@@ -1130,8 +1127,6 @@
	DPRINTF("out of memory\n");
	goto detach;
	}
	- device_set_ivars(sc->sc_child[i].pcm_device,
	- &sc->sc_sndcard_func);
	}

	bus_attach_children(dev);
	diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c
	--- a/sys/dev/sound/usb/uaudio_pcm.c
	+++ b/sys/dev/sound/usb/uaudio_pcm.c
	@@ -190,18 +190,7 @@
	static int
	ua_probe(device_t dev)
	{
	- struct sndcard_func *func;
	-
	- /* the parent device has already been probed */
	-
	- func = device_get_ivars(dev);
	-
	- if ((func == NULL) \|\|
	- (func->func != SCF_PCM)) {
	- return (ENXIO);
	- }
	-
	- return (BUS_PROBE_DEFAULT);
	+ return (0);
	}

	static int