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

Commit 8db324ec authored by David Vrabel's avatar David Vrabel Committed by Greg Kroah-Hartman
Browse files

WUSB: disconnect all devices when stopping a WUSB HCD 



Make sure all WUSB devices are disconnected when stopping a WUSB HCD so
that we don't leak the devices' wusb_dev structures.

Signed-off-by: default avatarDavid Vrabel <david.vrabel@csr.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f720af91

drivers/usb/wusbcore/devconnect.c

+13 −6
Original line number Diff line number Diff line
@@ -396,6 +396,7 @@ static void __wusbhc_dev_disconnect(struct wusbhc *wusbhc, 


	/* After a device disconnects, change the GTK (see [WUSB]

	 * section 6.2.11.2). */

	if (wusbhc->active)

		wusbhc_gtk_rekey(wusbhc);



	/* The Wireless USB part has forgotten about the device already; now
@@ -1084,15 +1085,21 @@ int wusbhc_devconnect_start(struct wusbhc *wusbhc) 
 * wusbhc_devconnect_stop - stop managing connected devices

 * @wusbhc: the WUSB HC

 *

 * Removes the Host Info IE and stops the keep alives.

 *

 * FIXME: should this disconnect all devices?

 * Disconnects any devices still connected, stops the keep alives and

 * removes the Host Info IE.

 */

void wusbhc_devconnect_stop(struct wusbhc *wusbhc)

{

	cancel_delayed_work_sync(&wusbhc->keep_alive_timer);

	WARN_ON(!list_empty(&wusbhc->cack_list));

	int i;



	mutex_lock(&wusbhc->mutex);

	for (i = 0; i < wusbhc->ports_max; i++) {

		if (wusbhc->port[i].wusb_dev)

			__wusbhc_dev_disconnect(wusbhc, &wusbhc->port[i]);

	}

	mutex_unlock(&wusbhc->mutex);



	cancel_delayed_work_sync(&wusbhc->keep_alive_timer);

	wusbhc_mmcie_rm(wusbhc, &wusbhc->wuie_host_info->hdr);

	kfree(wusbhc->wuie_host_info);

	wusbhc->wuie_host_info = NULL;