From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: YueHaibing <yuehaibing@huawei.com>,
Ben Skeggs <bskeggs@redhat.com>, Sasha Levin <sashal@kernel.org>,
dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org
Subject: [PATCH AUTOSEL 4.14 33/37] drm/nouveau/debugfs: Fix check of pm_runtime_get_sync failure
Date: Fri, 29 Mar 2019 20:54:34 -0400 [thread overview]
Message-ID: <20190330005441.27540-33-sashal@kernel.org> (raw)
In-Reply-To: <20190330005441.27540-1-sashal@kernel.org>
From: YueHaibing <yuehaibing@huawei.com>
[ Upstream commit 909e9c9c428376e2a43d178ed4b0a2d5ba9cb7d3 ]
pm_runtime_get_sync returns negative on failure.
Fixes: eaeb9010bb4b ("drm/nouveau/debugfs: Wake up GPU before doing any reclocking")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/gpu/drm/nouveau/nouveau_debugfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
index 9109b69cd052..9635704a1d86 100644
--- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c
+++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
@@ -161,7 +161,7 @@ nouveau_debugfs_pstate_set(struct file *file, const char __user *ubuf,
}
ret = pm_runtime_get_sync(drm->dev);
- if (IS_ERR_VALUE(ret) && ret != -EACCES)
+ if (ret < 0 && ret != -EACCES)
return ret;
ret = nvif_mthd(ctrl, NVIF_CONTROL_PSTATE_USER, &args, sizeof(args));
pm_runtime_put_autosuspend(drm->dev);
--
2.19.1
next prev parent reply other threads:[~2019-03-30 1:02 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-30 0:54 [PATCH AUTOSEL 4.14 01/37] ARC: u-boot args: check that magic number is correct Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 02/37] arc: hsdk_defconfig: Enable CONFIG_BLK_DEV_RAM Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 03/37] perf/core: Restore mmap record type correctly Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 04/37] ext4: add missing brelse() in add_new_gdb_meta_bg() Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 05/37] ext4: report real fs size after failed resize Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 06/37] ALSA: echoaudio: add a check for ioremap_nocache Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 07/37] ALSA: sb8: add a check for request_region Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 08/37] auxdisplay: hd44780: Fix memory leak on ->remove() Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 09/37] IB/mlx4: Fix race condition between catas error reset and aliasguid flows Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 10/37] mmc: davinci: remove extraneous __init annotation Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 11/37] ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and declaration Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 12/37] thermal/intel_powerclamp: fix __percpu declaration of worker_data Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 13/37] thermal: bcm2835: Fix crash in bcm2835_thermal_debugfs Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 14/37] thermal/int340x_thermal: Add additional UUIDs Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 15/37] thermal/int340x_thermal: fix mode setting Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 16/37] thermal/intel_powerclamp: fix truncated kthread name Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 17/37] scsi: iscsi: flush running unbind operations when removing a session Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 18/37] x86/mm: Don't leak kernel addresses Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 19/37] tools/power turbostat: return the exit status of a command Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 20/37] perf list: Don't forget to drop the reference to the allocated thread_map Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 21/37] perf config: Fix an error in the config template documentation Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 22/37] perf config: Fix a memory leak in collect_config() Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 23/37] perf build-id: Fix memory leak in print_sdt_events() Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 24/37] perf top: Fix error handling in cmd_top() Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 25/37] perf hist: Add missing map__put() in error case Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 26/37] perf evsel: Free evsel->counts in perf_evsel__exit() Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 27/37] perf tests: Fix a memory leak of cpu_map object in the openat_syscall_event_on_all_cpus test Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 28/37] perf tests: Fix memory leak by expr__find_other() in test__expr() Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 29/37] perf tests: Fix a memory leak in test__perf_evsel__tp_sched_test() Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 30/37] irqchip/mbigen: Don't clear eventid when freeing an MSI Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 31/37] x86/hpet: Prevent potential NULL pointer dereference Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 32/37] x86/cpu/cyrix: Use correct macros for Cyrix calls on Geode processors Sasha Levin
2019-03-30 0:54 ` Sasha Levin [this message]
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 34/37] iommu/vt-d: Check capability before disabling protected memory Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 35/37] x86/hw_breakpoints: Make default case in hw_breakpoint_arch_parse() return an error Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 36/37] fix incorrect error code mapping for OBJECTID_NOT_FOUND Sasha Levin
2019-03-30 0:54 ` [PATCH AUTOSEL 4.14 37/37] ext4: prohibit fstrim in norecovery mode Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190330005441.27540-33-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=bskeggs@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=stable@vger.kernel.org \
--cc=yuehaibing@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).