Merge tag 'i3c/fixes-for-5.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux (520fac05) · Commits · 戴 / test

drivers/i3c/master.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1828,7 +1828,7 @@ int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master,

		ret = i3c_master_retrieve_dev_info(newdev);
		if (ret)
		goto err_free_dev;
		goto err_detach_dev;

		olddev = i3c_master_search_i3c_dev_duplicate(newdev);
		if (olddev) {

+12 −6

Original line number	Diff line number	Diff line
		@@ -419,12 +419,9 @@ static void dw_i3c_master_enqueue_xfer(struct dw_i3c_master *master,
		spin_unlock_irqrestore(&master->xferqueue.lock, flags);
		}

		static void dw_i3c_master_dequeue_xfer(struct dw_i3c_master *master,
		static void dw_i3c_master_dequeue_xfer_locked(struct dw_i3c_master *master,
		struct dw_i3c_xfer *xfer)
		{
		unsigned long flags;

		spin_lock_irqsave(&master->xferqueue.lock, flags);
		if (master->xferqueue.cur == xfer) {
		u32 status;

		@@ -439,6 +436,15 @@ static void dw_i3c_master_dequeue_xfer(struct dw_i3c_master *master,
		} else {
		list_del_init(&xfer->node);
		}
		}

		static void dw_i3c_master_dequeue_xfer(struct dw_i3c_master *master,
		struct dw_i3c_xfer *xfer)
		{
		unsigned long flags;

		spin_lock_irqsave(&master->xferqueue.lock, flags);
		dw_i3c_master_dequeue_xfer_locked(master, xfer);
		spin_unlock_irqrestore(&master->xferqueue.lock, flags);
		}

		@@ -494,7 +500,7 @@ static void dw_i3c_master_end_xfer_locked(struct dw_i3c_master *master, u32 isr)
		complete(&xfer->comp);

		if (ret < 0) {
		dw_i3c_master_dequeue_xfer(master, xfer);
		dw_i3c_master_dequeue_xfer_locked(master, xfer);
		writel(readl(master->regs + DEVICE_CTRL) \| DEV_CTRL_RESUME,
		master->regs + DEVICE_CTRL);
		}