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

Commit 5e982c91 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.18.75 into android-3.18 



Changes in 3.18.75
	usb: gadget: inode.c: fix unbalanced spin_lock in ep0_write
	USB: gadgetfs: Fix crash caused by inadequate synchronization
	USB: gadgetfs: fix copy_to_user while holding spinlock
	usb-storage: unusual_devs entry to fix write-access regression for Seagate external drives
	usb: renesas_usbhs: fix the BCLR setting condition for non-DCP pipe
	usb: renesas_usbhs: fix usbhsf_fifo_clear() for RX direction
	ALSA: usb-audio: Check out-of-bounds access by corrupted buffer descriptor
	usb: pci-quirks.c: Corrected timeout values used in handshake
	USB: dummy-hcd: fix connection failures (wrong speed)
	USB: dummy-hcd: fix infinite-loop resubmission bug
	USB: devio: Don't corrupt user memory
	USB: uas: fix bug in handling of alternate settings
	usb: Increase quirk delay for USB devices
	USB: fix out-of-bounds in usb_set_configuration
	xhci: fix finding correct bus_state structure for USB 3.1 hosts
	iio: ad_sigma_delta: Implement a dedicated reset function
	staging: iio: ad7192: Fix - use the dedicated reset function avoiding dma from stack.
	iio: core: Return error for failed read_reg
	iio: ad7793: Fix the serial interface reset
	iio: adc: mcp320x: Fix oops on module unload
	uwb: properly check kthread_run return value
	uwb: ensure that endpoint is interrupt
	lsm: fix smack_inode_removexattr and xattr_getsecurity memleak
	ALSA: usx2y: Suppress kernel warning at page allocation failures
	driver core: platform: Don't read past the end of "driver_override" buffer
	HID: i2c-hid: allocate hid buffers for real worst case
	drm/i915/bios: ignore HDMI on port A
	ext4: only call ext4_truncate when size <= isize
	fs/super.c: fix race between freeze_super() and thaw_super()
	ext4: fix data corruption for mmap writes
	ext4: Don't clear SGID when inheriting ACLs
	ext4: validate s_first_meta_bg at mount time
	ext4: fix fencepost in s_first_meta_bg validation
	Linux 3.18.75

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents c8d3b871 3e2bb7d2

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 74

SUBLEVEL = 75

EXTRAVERSION =

NAME = Diseased Newt

drivers/base/platform.c

+2 −1
Original line number Diff line number Diff line
@@ -729,7 +729,8 @@ static ssize_t driver_override_store(struct device *dev, 
	struct platform_device *pdev = to_platform_device(dev);

	char *driver_override, *old, *cp;



	if (count > PATH_MAX)

	/* We need to keep extra room for a newline */

	if (count >= (PAGE_SIZE - 1))

		return -EINVAL;



	driver_override = kstrndup(buf, count, GFP_KERNEL);

drivers/gpu/drm/i915/intel_bios.c

+7 −0
Original line number Diff line number Diff line
@@ -940,6 +940,13 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, 
	is_hdmi = is_dvi && (child->common.device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;

	is_edp = is_dp && (child->common.device_type & DEVICE_TYPE_INTERNAL_CONNECTOR);



	if (port == PORT_A && is_dvi) {

		DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n",

			      is_hdmi ? "/HDMI" : "");

		is_dvi = false;

		is_hdmi = false;

	}



	info->supports_dvi = is_dvi;

	info->supports_hdmi = is_hdmi;

	info->supports_dp = is_dp;

drivers/hid/i2c-hid/i2c-hid.c

+2 −1
Original line number Diff line number Diff line
@@ -526,7 +526,8 @@ static int i2c_hid_alloc_buffers(struct i2c_hid *ihid, size_t report_size) 
{

	/* the worst case is computed from the set_report command with a

	 * reportID > 15 and the maximum report length */

	int args_len = sizeof(__u8) + /* optional ReportID byte */

	int args_len = sizeof(__u8) + /* ReportID */

		       sizeof(__u8) + /* optional ReportID byte */

		       sizeof(__u16) + /* data register */

		       sizeof(__u16) + /* size of the report */

		       report_size; /* report */

drivers/iio/adc/ad7793.c

+2 −2
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static int ad7793_setup(struct iio_dev *indio_dev, 
	unsigned int vref_mv)

{

	struct ad7793_state *st = iio_priv(indio_dev);

	int i, ret = -1;

	int i, ret;

	unsigned long long scale_uv;

	u32 id;
@@ -266,7 +266,7 @@ static int ad7793_setup(struct iio_dev *indio_dev, 
		return ret;



	/* reset the serial interface */

	ret = spi_write(st->sd.spi, (u8 *)&ret, sizeof(ret));

	ret = ad_sd_reset(&st->sd, 32);

	if (ret < 0)

		goto out;

	usleep_range(500, 2000); /* Wait for at least 500us */