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

Commit a1951686 authored by Michael Benedict's avatar Michael Benedict
Browse files

source: G95xF DSH5 



Signed-off-by: default avatarMichael Benedict <michaelbt@live.com>
parent 2a89387e

drivers/gpu/arm/b_r16p0/mali_kbase_mem.c

+8 −0
Original line number Diff line number Diff line
@@ -1425,6 +1425,14 @@ static int kbase_do_syncset(struct kbase_context *kctx, 
	kbase_os_mem_map_lock(kctx);

	kbase_gpu_vm_lock(kctx);



  /* MALI_SEC_INTEGRATION */

#if defined (CONFIG_SOC_EXYNOS8895)

  if (sset->size > 8*1024*1024) {

       flush_all_cpu_caches();

       goto out_unlock;

  }

#endif



	/* find the region where the virtual address is contained */

	reg = kbase_region_tracker_find_region_enclosing_address(kctx,

			sset->mem_handle.basep.handle);

drivers/media/usb/uvc/uvc_driver.c

+11 −3
Original line number Diff line number Diff line
@@ -1019,11 +1019,19 @@ static int uvc_parse_standard_control(struct uvc_device *dev, 
			return -EINVAL;

		}



		/* Make sure the terminal type MSB is not null, otherwise it

		 * could be confused with a unit.

		/*

		 * Reject invalid terminal types that would cause issues:

		 *

		 * - The high byte must be non-zero, otherwise it would be

		 *   confused with a unit.

		 *

		 * - Bit 15 must be 0, as we use it internally as a terminal

		 *   direction flag.

		 *

		 * Other unknown types are accepted.

		 */

		type = get_unaligned_le16(&buffer[4]);

		if ((type & 0xff00) == 0) {

		if ((type & 0x7f00) == 0 || (type & 0x8000) != 0) {

			uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol "

				"interface %d INPUT_TERMINAL %d has invalid "

				"type 0x%04x, skipping\n", udev->devnum,

drivers/usb/gadget/function/f_acm.c

+15 −10
Original line number Diff line number Diff line
@@ -546,6 +546,7 @@ static int acm_notify_serial_state(struct f_acm *acm) 


	spin_lock_irqsave(&acm->lock, flags);



	if (acm->notify->enabled) {

		if (acm->notify_req) {

			dev_dbg(&cdev->gadget->dev, "acm ttyGS%d serial state %04x\n",

				acm->port_num, acm->serial_state);
@@ -556,6 +557,10 @@ static int acm_notify_serial_state(struct f_acm *acm) 
			acm->pending = true;

			status = 0;

		}

	} else {

		status = -EAGAIN;

		printk(KERN_DEBUG "usb: %s acm function already disabled\n", __func__);

	}

	spin_unlock_irqrestore(&acm->lock, flags);

	return status;

}
@@ -582,9 +587,9 @@ static void acm_cdc_notify_complete(struct usb_ep *ep, struct usb_request *req) 
#ifdef CONFIG_USB_DUN_SUPPORT

int acm_notify(void *dev, u16 state)

{

	struct f_acm	*acm;

	if (dev) {

		acm = (struct f_acm *)dev;

	struct f_acm    *acm = (struct f_acm *)dev;



	if (acm && acm->notify->enabled) {

		acm->serial_state = state;

		acm_notify_serial_state(acm);

	} else {