diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-30 12:48:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-30 12:48:37 +0100 |
| commit | c0c20ac78811bbb321b9f1b1b7ee3c00c847e95d (patch) | |
| tree | 66376e23a2e88beaa9ffcfb9420f6ed8885578a4 /drivers/gpu/drm/msm/msm_perfcntr.c | |
| parent | 19cb490f7b0c1e5808a81ac385dff32045aa98aa (diff) | |
| parent | bf234c28d9e24e3d6c42a6202e3f92fba514c2ae (diff) | |
| download | linux-next-c0c20ac78811bbb321b9f1b1b7ee3c00c847e95d.tar.gz linux-next-c0c20ac78811bbb321b9f1b1b7ee3c00c847e95d.zip | |
Merge branch 'fs-next' of linux-next
# Conflicts:
# fs/coredump.c
# fs/f2fs/f2fs.h
# fs/fuse/dax.c
# fs/xfs/libxfs/xfs_btree.c
Diffstat (limited to 'drivers/gpu/drm/msm/msm_perfcntr.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_perfcntr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_perfcntr.c b/drivers/gpu/drm/msm/msm_perfcntr.c index ce65b1160955..7fa2e858bd08 100644 --- a/drivers/gpu/drm/msm/msm_perfcntr.c +++ b/drivers/gpu/drm/msm/msm_perfcntr.c @@ -543,8 +543,8 @@ msm_ioctl_perfcntr_config(struct drm_device *dev, void *data, struct drm_file *f FD_PREPARE(fdf, O_CLOEXEC, anon_inode_getfile("[msm_perfcntrs]", &stream_fops, stream, 0)); - if (fdf.err) - return fdf.err; + if (fdf->fd < 0) + return fdf->fd; INIT_WORK(&stream->sel_work, sel_worker); kthread_init_work(&stream->sample_work, sample_worker); |