Commit 5477a43a authored Feb 16, 2019 by Arnd Bergmann

Merge tag 'qcom-drivers-for-5.1-3' of...

Merge tag 'qcom-drivers-for-5.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into arm/drivers

Qualcomm ARM Based Driver Updates for v5.1 - Part 3

* Fixup types in Qualcomm LLCC patch

* tag 'qcom-drivers-for-5.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux

:
  soc: qcom: llcc-slice: Fix typos

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 5aa8f495 32616b21

drivers/soc/qcom/llcc-slice.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ int llcc_slice_activate(struct llcc_slice_desc *desc)
		int ret;
		u32 act_ctrl_val;

		If (IS_ERR(drv_data))
		if (IS_ERR(drv_data))
		return PTR_ERR(drv_data);

		if (IS_ERR_OR_NULL(desc))
		@@ -189,7 +189,7 @@ int llcc_slice_deactivate(struct llcc_slice_desc *desc)
		u32 act_ctrl_val;
		int ret;

		If (IS_ERR(drv_data))
		if (IS_ERR(drv_data))
		return PTR_ERR(drv_data);

		if (IS_ERR_OR_NULL(desc))