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

Commit 94edede0 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 0f715024 on remote branch 

Change-Id: Id61a57eaca3e8f0cd8f033124659dd60f8d8d84e
parents b7af6d71 0f715024

drivers/crypto/msm/qcedev.c

+9 −1
Original line number Diff line number Diff line
@@ -2036,7 +2036,9 @@ static inline long qcedev_ioctl(struct file *file, 
				goto exit_free_qcedev_areq;

			}



			if (map_buf.num_fds > QCEDEV_MAX_BUFFERS) {

			if (map_buf.num_fds > ARRAY_SIZE(map_buf.fd)) {

				pr_err("%s: err: num_fds = %d exceeds max value\n",

				__func__, map_buf.num_fds);

				err = -EINVAL;

				goto exit_free_qcedev_areq;

			}
@@ -2076,6 +2078,12 @@ static inline long qcedev_ioctl(struct file *file, 
				err = -EFAULT;

				goto exit_free_qcedev_areq;

			}

			if (unmap_buf.num_fds > ARRAY_SIZE(unmap_buf.fd)) {

				pr_err("%s: err: num_fds = %d exceeds max value\n",

				__func__, unmap_buf.num_fds);

				err = -EINVAL;

				goto exit_free_qcedev_areq;

			}



			for (i = 0; i < unmap_buf.num_fds; i++) {

				err = qcedev_check_and_unmap_buffer(handle,

drivers/media/platform/msm/cvp/cvp_hfi.c

+1 −0
Original line number Diff line number Diff line
@@ -2931,6 +2931,7 @@ static int __power_collapse(struct iris_hfi_device *device, bool force) 
	dprintk(CVP_WARN, "Skip PC(%#x, %#x, %#x)\n",

		wfi_status, idle_status, pc_ready);

	__flush_debug_queue(device, device->raw_packet);

	__dsp_resume(device, 0);

	return -EAGAIN;

}

drivers/net/usb/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ obj-$(CONFIG_USB_HSO) += hso.o 
obj-$(CONFIG_USB_LAN78XX)	+= lan78xx.o

obj-$(CONFIG_USB_NET_AX8817X)	+= asix.o

asix-y := asix_devices.o asix_common.o ax88172a.o

obj-$(CONFIG_USB_NET_AX88179_178A)      += ax88179_178a.o

obj-$(CONFIG_USB_NET_AX88179_178A)      += ax_usb_nic.o

ax_usb_nic-y := ax_main.o ax88179_178a.o ax88179a_772d.o

obj-$(CONFIG_USB_NET_CDCETHER)	+= cdc_ether.o

obj-$(CONFIG_USB_NET_CDC_EEM)	+= cdc_eem.o

obj-$(CONFIG_USB_NET_DM9601)	+= dm9601.o