Merge tag 'vla-leftovers-v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux (84f56852) · Commits · 戴 / test

drivers/bus/imx-weim.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -45,6 +45,8 @@ static const struct imx_weim_devtype imx51_weim_devtype = {
		.cs_stride = 0x18,
		};

		#define MAX_CS_REGS_COUNT 6

		static const struct of_device_id weim_id_table[] = {
		/* i.MX1/21 */
		{ .compatible = "fsl,imx1-weim", .data = &imx1_weim_devtype, },
		@@ -112,9 +114,12 @@ err:
		static int __init weim_timing_setup(struct device_node np, void __iomem base,
		const struct imx_weim_devtype *devtype)
		{
		u32 cs_idx, value[devtype->cs_regs_count];
		u32 cs_idx, value[MAX_CS_REGS_COUNT];
		int i, ret;

		if (WARN_ON(devtype->cs_regs_count > MAX_CS_REGS_COUNT))
		return -EINVAL;

		/* get the CS index from this child node's "reg" property. */
		ret = of_property_read_u32(np, "reg", &cs_idx);
		if (ret)

+4 −1

Original line number	Diff line number	Diff line
		@@ -76,9 +76,12 @@ struct tda9950_priv {
		static int tda9950_write_range(struct i2c_client client, u8 addr, u8 p, int cnt)
		{
		struct i2c_msg msg;
		u8 buf[cnt + 1];
		u8 buf[CEC_MAX_MSG_SIZE + 3];
		int ret;

		if (WARN_ON(cnt > sizeof(buf) - 1))
		return -EINVAL;

		buf[0] = addr;
		memcpy(buf + 1, p, cnt);