Skip to content

Commit c6d6a82

Browse files
committed
Merge tag 'drm-misc-next-fixes-2024-02-29' of https://anongit.freedesktop.org/git/drm/drm-misc into drm-next
Short summary of fixes pull: i915: - Fix NULL-pointer deref imx: - dcss: Fix resource-size calculation firmware: - sysfb: Fix returned error code Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20240229085331.GA25863@localhost.localdomain
2 parents ca66211 + 9cb3542 commit c6d6a82

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

drivers/firmware/sysfb.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,10 @@ static __init int sysfb_init(void)
127127
sysfb_apply_efi_quirks();
128128

129129
parent = sysfb_parent_dev(si);
130-
if (IS_ERR(parent))
130+
if (IS_ERR(parent)) {
131+
ret = PTR_ERR(parent);
131132
goto unlock_mutex;
133+
}
132134

133135
/* try to create a simple-framebuffer device */
134136
compatible = sysfb_parse_mode(si, &mode);

drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ static void heartbeat_commit(struct i915_request *rq,
9696
static void show_heartbeat(const struct i915_request *rq,
9797
struct intel_engine_cs *engine)
9898
{
99-
struct drm_printer p = drm_dbg_printer(&rq->i915->drm, DRM_UT_DRIVER,
100-
"heartbeat");
99+
struct drm_printer p =
100+
drm_dbg_printer(&engine->i915->drm, DRM_UT_DRIVER, "heartbeat");
101101

102102
if (!rq) {
103103
intel_engine_dump(engine, &p,

drivers/gpu/drm/imx/dcss/dcss-dev.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ struct dcss_dev *dcss_dev_create(struct device *dev, bool hdmi_output)
167167
struct resource *res;
168168
struct dcss_dev *dcss;
169169
const struct dcss_type_data *devtype;
170-
resource_size_t res_len;
171170

172171
devtype = of_device_get_match_data(dev);
173172
if (!devtype) {
@@ -181,8 +180,7 @@ struct dcss_dev *dcss_dev_create(struct device *dev, bool hdmi_output)
181180
return ERR_PTR(-EINVAL);
182181
}
183182

184-
res_len = res->end - res->start;
185-
if (!devm_request_mem_region(dev, res->start, res_len, "dcss")) {
183+
if (!devm_request_mem_region(dev, res->start, resource_size(res), "dcss")) {
186184
dev_err(dev, "cannot request memory region\n");
187185
return ERR_PTR(-EBUSY);
188186
}

0 commit comments

Comments
 (0)