diff options
author | Dan Williams <dan.j.williams@intel.com> | 2023-04-05 00:37:25 +0200 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2023-04-05 00:37:25 +0200 |
commit | ca712e47054678c5ce93a0e0f686353ad5561195 (patch) | |
tree | 575dd9f2e541ddd74b72e82dfe69c5badcb9e281 /drivers/video/fbdev/intelfb/intelfbdrv.c | |
parent | cxl/hdm: Extend DVSEC range register emulation for region enumeration (diff) | |
parent | PCI/DOE: Fix memory leak with CONFIG_DEBUG_OBJECTS=y (diff) | |
download | linux-ca712e47054678c5ce93a0e0f686353ad5561195.tar.xz linux-ca712e47054678c5ce93a0e0f686353ad5561195.zip |
Merge branch 'for-6.3/cxl-doe-fixes' into for-6.3/cxl
Pick up the fixes (first 6 patches) from the DOE rework series from
Lukas for v6.3-rc.
Link: https://lore.kernel.org/all/cover.1678543498.git.lukas@wunner.de/
Diffstat (limited to 'drivers/video/fbdev/intelfb/intelfbdrv.c')
-rw-r--r-- | drivers/video/fbdev/intelfb/intelfbdrv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/fbdev/intelfb/intelfbdrv.c b/drivers/video/fbdev/intelfb/intelfbdrv.c index 0a9e5067b201..a81095b2b1ea 100644 --- a/drivers/video/fbdev/intelfb/intelfbdrv.c +++ b/drivers/video/fbdev/intelfb/intelfbdrv.c @@ -1222,6 +1222,9 @@ static int intelfb_check_var(struct fb_var_screeninfo *var, dinfo = GET_DINFO(info); + if (!var->pixclock) + return -EINVAL; + /* update the pitch */ if (intelfbhw_validate_mode(dinfo, var) != 0) return -EINVAL; |