Merge "i3c: Fix the verification of random PID" (83c34b50) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/i3c/master.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1980,7 +1980,6 @@ of_i3c_master_add_i3c_boardinfo(struct i3c_master_controller *master,
		{
		struct i3c_dev_boardinfo *boardinfo;
		struct device *dev = &master->dev;
		struct i3c_device_info info = { };
		enum i3c_addr_slot_status addrstatus;
		u32 init_dyn_addr = 0;

		@@ -2012,8 +2011,8 @@ of_i3c_master_add_i3c_boardinfo(struct i3c_master_controller *master,

		boardinfo->pid = ((u64)reg[1] << 32) \| reg[2];

		if ((info.pid & GENMASK_ULL(63, 48)) \|\|
		I3C_PID_RND_LOWER_32BITS(info.pid))
		if ((boardinfo->pid & GENMASK_ULL(63, 48)) \|\|
		I3C_PID_RND_LOWER_32BITS(boardinfo->pid))
		return -EINVAL;

		boardinfo->init_dyn_addr = init_dyn_addr;