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

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

Merge 4.4.83 into android-4.4 



Changes in 4.4.83
	cpuset: fix a deadlock due to incomplete patching of cpusets_enabled()
	mm: ratelimit PFNs busy info message
	iscsi-target: fix memory leak in iscsit_setup_text_cmd()
	iscsi-target: Fix iscsi_np reset hung task during parallel delete
	fuse: initialize the flock flag in fuse_file on allocation
	nfs/flexfiles: fix leak of nfs4_ff_ds_version arrays
	USB: serial: option: add D-Link DWM-222 device ID
	USB: serial: cp210x: add support for Qivicon USB ZigBee dongle
	USB: serial: pl2303: add new ATEN device id
	usb: musb: fix tx fifo flush handling again
	USB: hcd: Mark secondary HCD as dead if the primary one died
	staging:iio:resolver:ad2s1210 fix negative IIO_ANGL_VEL read
	iio: accel: bmc150: Always restore device to normal mode after suspend-resume
	iio: light: tsl2563: use correct event code
	uas: Add US_FL_IGNORE_RESIDUE for Initio Corporation INIC-3069
	USB: Check for dropped connection before switching to full speed
	usb: core: unlink urbs from the tail of the endpoint's urb_list
	usb: quirks: Add no-lpm quirk for Moshi USB to Ethernet Adapter
	usb:xhci:Add quirk for Certain failing HP keyboard on reset after resume
	iio: adc: vf610_adc: Fix VALT selection value for REFSEL bits
	pnfs/blocklayout: require 64-bit sector_t
	pinctrl: sunxi: add a missing function of A10/A20 pinctrl driver
	pinctrl: samsung: Remove bogus irq_[un]mask from resource management
	Linux 4.4.83

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 623f33f2 425fdd28

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 82

SUBLEVEL = 83

EXTRAVERSION =

NAME = Blurry Fish Butt

drivers/iio/accel/bmc150-accel-core.c

+1 −8
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ struct bmc150_accel_data { 
	struct device *dev;

	int irq;

	struct bmc150_accel_interrupt interrupts[BMC150_ACCEL_INTERRUPTS];

	atomic_t active_intr;

	struct bmc150_accel_trigger triggers[BMC150_ACCEL_TRIGGERS];

	struct mutex mutex;

	u8 fifo_mode, watermark;
@@ -489,11 +488,6 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i, 
		goto out_fix_power_state;

	}



	if (state)

		atomic_inc(&data->active_intr);

	else

		atomic_dec(&data->active_intr);



	return 0;



out_fix_power_state:
@@ -1704,7 +1698,6 @@ static int bmc150_accel_resume(struct device *dev) 
	struct bmc150_accel_data *data = iio_priv(indio_dev);



	mutex_lock(&data->mutex);

	if (atomic_read(&data->active_intr))

	bmc150_accel_set_mode(data, BMC150_ACCEL_SLEEP_MODE_NORMAL, 0);

	bmc150_accel_fifo_set_mode(data);

	mutex_unlock(&data->mutex);

drivers/iio/adc/vf610_adc.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
#define VF610_ADC_ADSTS_MASK		0x300

#define VF610_ADC_ADLPC_EN		0x80

#define VF610_ADC_ADHSC_EN		0x400

#define VF610_ADC_REFSEL_VALT		0x100

#define VF610_ADC_REFSEL_VALT		0x800

#define VF610_ADC_REFSEL_VBG		0x1000

#define VF610_ADC_ADTRG_HARD		0x2000

#define VF610_ADC_AVGS_8		0x4000

drivers/iio/light/tsl2563.c

+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ static irqreturn_t tsl2563_event_handler(int irq, void *private) 
	struct tsl2563_chip *chip = iio_priv(dev_info);



	iio_push_event(dev_info,

		       IIO_UNMOD_EVENT_CODE(IIO_LIGHT,

		       IIO_UNMOD_EVENT_CODE(IIO_INTENSITY,

					    0,

					    IIO_EV_TYPE_THRESH,

					    IIO_EV_DIR_EITHER),

drivers/pinctrl/samsung/pinctrl-exynos.c

+0 −4
Original line number Diff line number Diff line
@@ -194,8 +194,6 @@ static int exynos_irq_request_resources(struct irq_data *irqd) 


	spin_unlock_irqrestore(&bank->slock, flags);



	exynos_irq_unmask(irqd);



	return 0;

}
@@ -216,8 +214,6 @@ static void exynos_irq_release_resources(struct irq_data *irqd) 
	shift = irqd->hwirq * bank_type->fld_width[PINCFG_TYPE_FUNC];

	mask = (1 << bank_type->fld_width[PINCFG_TYPE_FUNC]) - 1;



	exynos_irq_mask(irqd);



	spin_lock_irqsave(&bank->slock, flags);



	con = readl(d->virt_base + reg_con);