Commit 61ccc6f6 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: firewire: block .remove callback of bus driver till all of ALSA... 


ALSA: firewire: block .remove callback of bus driver till all of ALSA character devices are released

At present, in .remove callback of bus driver just decrease reference
count of device for ALSA card instance. This delegates release of the
device to a process in which the last of ALSA character device is
released.

On the other hand, the other drivers such as for devices on PCIe are
programmed to block .remove callback of bus driver till all of ALSA
character devices are released.

For consistency of behaviour for whole drivers, this probably confuses
users. This commit takes drivers in ALSA firewire stack to imitate the
above behaviour.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d06fb562

sound/firewire/bebob/bebob.c

+2 −2
Original line number Diff line number Diff line
@@ -374,8 +374,8 @@ static void bebob_remove(struct fw_unit *unit) 
	cancel_delayed_work_sync(&bebob->dwork);



	if (bebob->registered) {

		/* No need to wait for releasing card object in this context. */

		snd_card_free_when_closed(bebob->card);

		// Block till all of ALSA character devices are released.

		snd_card_free(bebob->card);

	} else {

		/* Don't forget this case. */

		bebob_free(bebob);

sound/firewire/digi00x/digi00x.c

+2 −2
Original line number Diff line number Diff line
@@ -172,8 +172,8 @@ static void snd_dg00x_remove(struct fw_unit *unit) 
	cancel_delayed_work_sync(&dg00x->dwork);



	if (dg00x->registered) {

		/* No need to wait for releasing card object in this context. */

		snd_card_free_when_closed(dg00x->card);

		// Block till all of ALSA character devices are released.

		snd_card_free(dg00x->card);

	} else {

		/* Don't forget this case. */

		dg00x_free(dg00x);

sound/firewire/fireface/ff.c

+2 −2
Original line number Diff line number Diff line
@@ -145,8 +145,8 @@ static void snd_ff_remove(struct fw_unit *unit) 
	cancel_work_sync(&ff->dwork.work);



	if (ff->registered) {

		/* No need to wait for releasing card object in this context. */

		snd_card_free_when_closed(ff->card);

		// Block till all of ALSA character devices are released.

		snd_card_free(ff->card);

	} else {

		/* Don't forget this case. */

		ff_free(ff);

sound/firewire/fireworks/fireworks.c

+2 −2
Original line number Diff line number Diff line
@@ -358,8 +358,8 @@ static void efw_remove(struct fw_unit *unit) 
	cancel_delayed_work_sync(&efw->dwork);



	if (efw->registered) {

		/* No need to wait for releasing card object in this context. */

		snd_card_free_when_closed(efw->card);

		// Block till all of ALSA character devices are released.

		snd_card_free(efw->card);

	} else {

		/* Don't forget this case. */

		efw_free(efw);

sound/firewire/isight.c

+2 −1
Original line number Diff line number Diff line
@@ -703,7 +703,8 @@ static void isight_remove(struct fw_unit *unit) 
	isight_stop_streaming(isight);

	mutex_unlock(&isight->mutex);



	snd_card_free_when_closed(isight->card);

	// Block till all of ALSA character devices are released.

	snd_card_free(isight->card);

}



static const struct ieee1394_device_id isight_id_table[] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE