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

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

Merge 4.19.261 into android-4.19-stable 



Changes in 4.19.261
	uas: add no-uas quirk for Hiksemi usb_disk
	usb-storage: Add Hiksemi USB3-FW to IGNORE_UAS
	uas: ignore UAS for Thinkplus chips
	net: usb: qmi_wwan: Add new usb-id for Dell branded EM7455
	ARM: dts: integrator: Tag PCI host with device_type
	ntfs: fix BUG_ON in ntfs_lookup_inode_by_name()
	libata: add ATA_HORKAGE_NOLPM for Pioneer BDR-207M and BDR-205
	mmc: moxart: fix 4-bit bus width and remove 8-bit bus width
	mm/page_alloc: fix race condition between build_all_zonelists and page allocation
	mm: prevent page_frag_alloc() from corrupting the memory
	mm/migrate_device.c: flush TLB while holding PTL
	ima: Have the LSM free its audit rule
	ima: Free the entire rule when deleting a list of rules
	ima: Free the entire rule if it fails to parse
	soc: sunxi: sram: Actually claim SRAM regions
	soc: sunxi: sram: Prevent the driver from being unbound
	soc: sunxi: sram: Fix probe function ordering issues
	soc: sunxi: sram: Fix debugfs info for A64 SRAM C
	Revert "drm: bridge: analogix/dp: add panel prepare/unprepare in suspend/resume time"
	Input: melfas_mip4 - fix return value check in mip4_probe()
	usbnet: Fix memory leak in usbnet_disconnect()
	nvme: add new line after variable declatation
	nvme: Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices
	selftests: Fix the if conditions of in test_extra_filter()
	clk: iproc: Do not rely on node name for correct PLL setup
	Linux 4.19.261

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I56efa2055fdc34e19fca6d710b837b6494381dd2
parents 79e13367 cf46ee80

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 260

SUBLEVEL = 261

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/integratorap.dts

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ 


	pci: pciv3@62000000 {

		compatible = "arm,integrator-ap-pci", "v3,v360epc-pci";

		device_type = "pci";

		#interrupt-cells = <1>;

		#size-cells = <2>;

		#address-cells = <3>;

drivers/ata/libata-core.c

+4 −0
Original line number Diff line number Diff line
@@ -4560,6 +4560,10 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	{ "PIONEER DVD-RW  DVR-212D",	NULL,	ATA_HORKAGE_NOSETXFER },

	{ "PIONEER DVD-RW  DVR-216D",	NULL,	ATA_HORKAGE_NOSETXFER },



	/* These specific Pioneer models have LPM issues */

	{ "PIONEER BD-RW   BDR-207M",	NULL,	ATA_HORKAGE_NOLPM },

	{ "PIONEER BD-RW   BDR-205",	NULL,	ATA_HORKAGE_NOLPM },



	/* Crucial BX100 SSD 500GB has broken LPM support */

	{ "CT500BX100SSD1",		NULL,	ATA_HORKAGE_NOLPM },

drivers/clk/bcm/clk-iproc-pll.c

+8 −4
Original line number Diff line number Diff line
@@ -736,6 +736,7 @@ void iproc_pll_clk_setup(struct device_node *node, 
	const char *parent_name;

	struct iproc_clk *iclk_array;

	struct clk_hw_onecell_data *clk_data;

	const char *clk_name;



	if (WARN_ON(!pll_ctrl) || WARN_ON(!clk_ctrl))

		return;
@@ -783,7 +784,12 @@ void iproc_pll_clk_setup(struct device_node *node, 
	iclk = &iclk_array[0];

	iclk->pll = pll;



	init.name = node->name;

	ret = of_property_read_string_index(node, "clock-output-names",

					    0, &clk_name);

	if (WARN_ON(ret))

		goto err_pll_register;



	init.name = clk_name;

	init.ops = &iproc_pll_ops;

	init.flags = 0;

	parent_name = of_clk_get_parent_name(node, 0);
@@ -803,13 +809,11 @@ void iproc_pll_clk_setup(struct device_node *node, 
		goto err_pll_register;



	clk_data->hws[0] = &iclk->hw;

	parent_name = clk_name;



	/* now initialize and register all leaf clocks */

	for (i = 1; i < num_clks; i++) {

		const char *clk_name;



		memset(&init, 0, sizeof(init));

		parent_name = node->name;



		ret = of_property_read_string_index(node, "clock-output-names",

						    i, &clk_name);

drivers/gpu/drm/bridge/analogix/analogix_dp_core.c

+0 −13
Original line number Diff line number Diff line
@@ -1690,12 +1690,6 @@ EXPORT_SYMBOL_GPL(analogix_dp_unbind); 
int analogix_dp_suspend(struct analogix_dp_device *dp)

{

	clk_disable_unprepare(dp->clock);



	if (dp->plat_data->panel) {

		if (drm_panel_unprepare(dp->plat_data->panel))

			DRM_ERROR("failed to turnoff the panel\n");

	}



	return 0;

}

EXPORT_SYMBOL_GPL(analogix_dp_suspend);
@@ -1710,13 +1704,6 @@ int analogix_dp_resume(struct analogix_dp_device *dp) 
		return ret;

	}



	if (dp->plat_data->panel) {

		if (drm_panel_prepare(dp->plat_data->panel)) {

			DRM_ERROR("failed to setup the panel\n");

			return -EBUSY;

		}

	}



	return 0;

}

EXPORT_SYMBOL_GPL(analogix_dp_resume);