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

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

Merge a4628a5b ("scsi: qla2xxx: Fix deletion race condition") into android11-5.4-lts 



Steps on the way to 5.4.258

Change-Id: Id358cb1b301e9045091342516d5615c9d32cd696
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents d8ca2109 a4628a5b

arch/powerpc/perf/hv-24x7.c

+1 −1
Original line number Diff line number Diff line
@@ -1313,7 +1313,7 @@ static int h_24x7_event_init(struct perf_event *event) 
	}



	domain = event_get_domain(event);

	if (domain >= HV_PERF_DOMAIN_MAX) {

	if (domain  == 0 || domain >= HV_PERF_DOMAIN_MAX) {

		pr_devel("invalid domain %d\n", domain);

		return -EINVAL;

	}

drivers/gpio/gpio-tb10x.c

+5 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static int tb10x_gpio_probe(struct platform_device *pdev) 
				handle_edge_irq, IRQ_NOREQUEST, IRQ_NOPROBE,

				IRQ_GC_INIT_MASK_CACHE);

		if (ret)

			return ret;

			goto err_remove_domain;



		gc = tb10x_gpio->domain->gc->gc[0];

		gc->reg_base                         = tb10x_gpio->base;
@@ -209,6 +209,10 @@ static int tb10x_gpio_probe(struct platform_device *pdev) 
	}



	return 0;



err_remove_domain:

	irq_domain_remove(tb10x_gpio->domain);

	return ret;

}



static int tb10x_gpio_remove(struct platform_device *pdev)

drivers/i2c/muxes/i2c-demux-pinctrl.c

+4 −0
Original line number Diff line number Diff line
@@ -243,6 +243,10 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) 


		props[i].name = devm_kstrdup(&pdev->dev, "status", GFP_KERNEL);

		props[i].value = devm_kstrdup(&pdev->dev, "ok", GFP_KERNEL);

		if (!props[i].name || !props[i].value) {

			err = -ENOMEM;

			goto err_rollback;

		}

		props[i].length = 3;



		of_changeset_init(&priv->chan[i].chgset);

drivers/input/serio/i8042-x86ia64io.h

+7 −0
Original line number Diff line number Diff line
@@ -1184,6 +1184,13 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { 
		.driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |

					SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)

	},

	/* See comment on TUXEDO InfinityBook S17 Gen6 / Clevo NS70MU above */

	{

		.matches = {

			DMI_MATCH(DMI_BOARD_NAME, "PD5x_7xPNP_PNR_PNN_PNT"),

		},

		.driver_data = (void *)(SERIO_QUIRK_NOAUX)

	},

	{

		.matches = {

			DMI_MATCH(DMI_BOARD_NAME, "X170SM"),

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+5 −0
Original line number Diff line number Diff line
@@ -2939,8 +2939,13 @@ static u32 hclge_check_event_cause(struct hclge_dev *hdev, u32 *clearval) 
static void hclge_clear_event_cause(struct hclge_dev *hdev, u32 event_type,

				    u32 regclr)

{

#define HCLGE_IMP_RESET_DELAY		5



	switch (event_type) {

	case HCLGE_VECTOR0_EVENT_RST:

		if (regclr == BIT(HCLGE_VECTOR0_IMPRESET_INT_B))

			mdelay(HCLGE_IMP_RESET_DELAY);



		hclge_write_dev(&hdev->hw, HCLGE_MISC_RESET_STS_REG, regclr);

		break;

	case HCLGE_VECTOR0_EVENT_MBX: