Merge "usb: otg: don't set a_alt_hnp_support feature for OTG 2.0 device" (1e26fe54) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/pwm/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -804,7 +804,7 @@ EXPORT_SYMBOL_GPL(devm_pwm_put);
		*/
		bool pwm_can_sleep(struct pwm_device *pwm)
		{
		return pwm->chip->can_sleep;
		return true;
		}
		EXPORT_SYMBOL_GPL(pwm_can_sleep);

drivers/usb/core/hub.c

+40 −31

Original line number	Diff line number	Diff line
		@@ -2264,39 +2264,48 @@ static int usb_enumerate_device_otg(struct usb_device *udev)
		&& udev->parent == udev->bus->root_hub) {
		struct usb_otg_descriptor *desc = NULL;
		struct usb_bus *bus = udev->bus;
		unsigned port1 = udev->portnum;

		/* descriptor may appear anywhere in config */
		if (__usb_get_extra_descriptor (udev->rawdescriptors[0],
		err = __usb_get_extra_descriptor(udev->rawdescriptors[0],
		le16_to_cpu(udev->config[0].desc.wTotalLength),
		USB_DT_OTG, (void **) &desc) == 0) {
		if (desc->bmAttributes & USB_OTG_HNP) {
		unsigned port1 = udev->portnum;

		dev_info(&udev->dev,
		"Dual-Role OTG device on %sHNP port\n",
		(port1 == bus->otg_port)
		? "" : "non-");
		USB_DT_OTG, (void **) &desc);
		if (err \|\| !(desc->bmAttributes & USB_OTG_HNP))
		return 0;
		dev_info(&udev->dev, "Dual-Role OTG device on %sHNP port\n",
		(port1 == bus->otg_port) ? "" : "non-");

		/* enable HNP before suspend, it's simpler */
		if (port1 == bus->otg_port)
		if (port1 == bus->otg_port) {
		bus->b_hnp_enable = 1;
		err = usb_control_msg(udev,
		usb_sndctrlpipe(udev, 0),
		USB_REQ_SET_FEATURE, 0,
		bus->b_hnp_enable
		? USB_DEVICE_B_HNP_ENABLE
		: USB_DEVICE_A_ALT_HNP_SUPPORT,
		0, NULL, 0, USB_CTRL_SET_TIMEOUT);
		USB_DEVICE_B_HNP_ENABLE,
		0, NULL, 0,
		USB_CTRL_SET_TIMEOUT);
		if (err < 0) {
		/* OTG MESSAGE: report errors here,
		/*
		* OTG MESSAGE: report errors here,
		* customize to match your product.
		*/
		dev_info(&udev->dev,
		"can't set HNP mode: %d\n",
		dev_err(&udev->dev, "can't set HNP mode: %d\n",
		err);
		bus->b_hnp_enable = 0;
		}
		}
		} else if (desc->bLength == sizeof
		(struct usb_otg_descriptor)) {
		/* Set a_alt_hnp_support for legacy otg device */
		err = usb_control_msg(udev,
		usb_sndctrlpipe(udev, 0),
		USB_REQ_SET_FEATURE, 0,
		USB_DEVICE_A_ALT_HNP_SUPPORT,
		0, NULL, 0,
		USB_CTRL_SET_TIMEOUT);
		if (err < 0)
		dev_err(&udev->dev,
		"set a_alt_hnp_support failed: %d\n",
		err);
		}
		}
		#endif

fs/aio.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -213,7 +213,12 @@ static struct dentry aio_mount(struct file_system_type fs_type,
		static const struct dentry_operations ops = {
		.d_dname = simple_dname,
		};
		return mount_pseudo(fs_type, "aio:", NULL, &ops, AIO_RING_MAGIC);
		struct dentry *root = mount_pseudo(fs_type, "aio:", NULL, &ops,
		AIO_RING_MAGIC);

		if (!IS_ERR(root))
		root->d_sb->s_iflags \|= SB_I_NOEXEC;
		return root;
		}

		/* aio_setup

fs/exec.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -98,6 +98,12 @@ static inline void put_binfmt(struct linux_binfmt * fmt)
		module_put(fmt->module);
		}

		bool path_noexec(const struct path *path)
		{
		return (path->mnt->mnt_flags & MNT_NOEXEC) \|\|
		(path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
		}

		#ifdef CONFIG_USELIB
		/*
		* Note that a shared library must be both readable and executable due to
		@@ -132,7 +138,7 @@ SYSCALL_DEFINE1(uselib, const char __user *, library)
		goto exit;

		error = -EACCES;
		if (file->f_path.mnt->mnt_flags & MNT_NOEXEC)
		if (path_noexec(&file->f_path))
		goto exit;

		fsnotify_open(file);
		@@ -790,7 +796,7 @@ static struct file do_open_exec(struct filename name)
		if (!S_ISREG(file_inode(file)->i_mode))
		goto exit;

		if (file->f_path.mnt->mnt_flags & MNT_NOEXEC)
		if (path_noexec(&file->f_path))
		goto exit;

		fsnotify_open(file);

fs/ext2/super.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -867,6 +867,7 @@ static int ext2_fill_super(struct super_block sb, void data, int silent)
		sb->s_flags = (sb->s_flags & ~MS_POSIXACL) \|
		((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
		MS_POSIXACL : 0);
		sb->s_iflags \|= SB_I_CGROUPWB;

		ext2_xip_verify_sb(sb); /* see if bdev supports xip, unset
		EXT2_MOUNT_XIP if not */