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

Commit 0ee7a34a authored by derfelot's avatar derfelot Committed by Andreas Schneider
Browse files

Merge Sony 47.1.A.12.119 Kernel 

source: https://developer.sony.com/file/download/open-source-archive-for-47-1-a-12-119/
parent 1b8f2fc5

drivers/usb/gadget/function/f_mtp.c

+6 −0
Original line number Diff line number Diff line
@@ -1428,6 +1428,12 @@ static int mtp_ctrlrequest(struct usb_composite_dev *cdev, 
			total = sizeof(*head) + (sizeof(*func) * func_num);



			/* header section */

			if (w_length < total &&

				w_length >= (sizeof(*head) + sizeof(*func))) {

				total = w_length;

				func_num = (total - sizeof(*head)) /

					sizeof(*func);

			}

			head->dwLength = total;

			head->bcdVersion = cpu_to_le16(0x0100);

			head->wIndex = cpu_to_le16(4);

sound/usb/card.c

+0 −1
Original line number Diff line number Diff line
@@ -681,7 +681,6 @@ static int usb_audio_probe(struct usb_interface *intf, 
	chip->num_interfaces++;

	usb_set_intfdata(intf, chip);

	intf->needs_remote_wakeup = 1;

	usb_enable_autosuspend(chip->dev);

	atomic_dec(&chip->active);

	mutex_unlock(&register_mutex);

	return 0;