Commit 97097054 authored Mar 17, 2020 by Alexander Shishkin Committed by Greg Kroah-Hartman Mar 25, 2020

intel_th: msu: Fix the unexpected state warning



commit 885f123554bbdc1807ca25a374be6e9b3bddf4de upstream.

The unexpected state warning should only warn on illegal state
transitions. Fix that.

Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Fixes: 615c164d ("intel_th: msu: Introduce buffer interface")
Cc: stable@vger.kernel.org # v5.4+
Link: https://lore.kernel.org/r/20200317062215.15598-5-alexander.shishkin@linux.intel.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 07c70054

drivers/hwtracing/intel_th/msu.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -718,9 +718,6 @@ static int msc_win_set_lockout(struct msc_window *win,

		if (old != expect) {
		ret = -EINVAL;
		dev_warn_ratelimited(msc_dev(win->msc),
		"expected lockout state %d, got %d\n",
		expect, old);
		goto unlock;
		}

		@@ -741,6 +738,10 @@ static int msc_win_set_lockout(struct msc_window *win,
		/* from intel_th_msc_window_unlock(), don't warn if not locked */
		if (expect == WIN_LOCKED && old == new)
		return 0;

		dev_warn_ratelimited(msc_dev(win->msc),
		"expected lockout state %d, got %d\n",
		expect, old);
		}

		return ret;