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

Commit 230cd5e2 authored by Karsten Wiese's avatar Karsten Wiese Committed by Jaroslav Kysela
Browse files

[ALSA] prevent oops & dead keyboard on usb unplugging while the device is being used 



USB generic driver,USB USX2Y
Without this patch, some usb kobjects, which are parents to
the usx2y's kobjects can be freed before the usx2y's.
This led to an oops in get_kobj_path_length() and a dead
keyboard, when the usx2y's kobjects were freed.
The patch ensures the correct sequence.
Tested ok on kernel 2.6.12-rc2.

Signed-off-by: default avatarKarsten Wiese <annabellesgarden@yahoo.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent fe5ac9dc

sound/usb/usbaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -3289,7 +3289,7 @@ static void snd_usb_audio_disconnect(struct usb_device *dev, void *ptr) 
		}

		usb_chip[chip->index] = NULL;

		up(&register_mutex);

		snd_card_free_in_thread(card);

		snd_card_free(card);

	} else {

		up(&register_mutex);

	}

sound/usb/usx2y/usbusx2y.c

+7 −4
Original line number Diff line number Diff line 
/*

 * usbusy2y.c - ALSA USB US-428 Driver

 *

2005-04-14 Karsten Wiese

	Version 0.8.7.2:

	Call snd_card_free() instead of snd_card_free_in_thread() to prevent oops with dead keyboard symptom.

	Tested ok with kernel 2.6.12-rc2.



2004-12-14 Karsten Wiese

	Version 0.8.7.1:

	snd_pcm_open for rawusb pcm-devices now returns -EBUSY if called without rawusb's hwdep device being open.
@@ -143,7 +148,7 @@ 




MODULE_AUTHOR("Karsten Wiese <annabellesgarden@yahoo.de>");

MODULE_DESCRIPTION("TASCAM "NAME_ALLCAPS" Version 0.8.7.1");

MODULE_DESCRIPTION("TASCAM "NAME_ALLCAPS" Version 0.8.7.2");

MODULE_LICENSE("GPL");

MODULE_SUPPORTED_DEVICE("{{TASCAM(0x1604), "NAME_ALLCAPS"(0x8001)(0x8005)(0x8007) }}");
@@ -430,8 +435,6 @@ static void usX2Y_usb_disconnect(struct usb_device* device, void* ptr) 
	if (ptr) {

		usX2Ydev_t* usX2Y = usX2Y((snd_card_t*)ptr);

		struct list_head* p;

		if (usX2Y->chip_status == USX2Y_STAT_CHIP_HUP)	// on 2.6.1 kernel snd_usbmidi_disconnect()

			return;					// calls us back. better leave :-) .

		usX2Y->chip.shutdown = 1;

		usX2Y->chip_status = USX2Y_STAT_CHIP_HUP;

		usX2Y_unlinkSeq(&usX2Y->AS04);
@@ -443,7 +446,7 @@ static void usX2Y_usb_disconnect(struct usb_device* device, void* ptr) 
		}

		if (usX2Y->us428ctls_sharedmem) 

			wake_up(&usX2Y->us428ctls_wait_queue_head);

		snd_card_free_in_thread((snd_card_t*)ptr);

		snd_card_free((snd_card_t*)ptr);

	}

}