intel_th: msu: Fix the unexpected state warning
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: 615c164da0
("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>
This commit is contained in:
Родитель
283f87c0d5
Коммит
885f123554
|
@ -718,9 +718,6 @@ static int msc_win_set_lockout(struct msc_window *win,
|
||||||
|
|
||||||
if (old != expect) {
|
if (old != expect) {
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
dev_warn_ratelimited(msc_dev(win->msc),
|
|
||||||
"expected lockout state %d, got %d\n",
|
|
||||||
expect, old);
|
|
||||||
goto unlock;
|
goto unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -741,6 +738,10 @@ unlock:
|
||||||
/* from intel_th_msc_window_unlock(), don't warn if not locked */
|
/* from intel_th_msc_window_unlock(), don't warn if not locked */
|
||||||
if (expect == WIN_LOCKED && old == new)
|
if (expect == WIN_LOCKED && old == new)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
dev_warn_ratelimited(msc_dev(win->msc),
|
||||||
|
"expected lockout state %d, got %d\n",
|
||||||
|
expect, old);
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче