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

Commit a2a8693b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: ccid_bridge: Don't kill URB in release after device is disconnected"

parents cc9d5a98 76c4427a
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -539,6 +539,14 @@ static int ccid_bridge_release(struct inode *ip, struct file *fp)

	pr_debug("called");

	mutex_lock(&ccid->open_mutex);
	if (ccid->intf == NULL) {
		ccid->opened = false;
		mutex_unlock(&ccid->open_mutex);
		goto done;
	}
	mutex_unlock(&ccid->open_mutex);

	usb_kill_urb(ccid->writeurb);
	usb_kill_urb(ccid->readurb);
	if (ccid->int_pipe)
@@ -550,6 +558,7 @@ static int ccid_bridge_release(struct inode *ip, struct file *fp)
	mutex_lock(&ccid->open_mutex);
	ccid->opened = false;
	mutex_unlock(&ccid->open_mutex);
done:
	return 0;
}