diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-02-01 21:40:42 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-02-01 21:40:42 +0300 |
| commit | d4ea2bd1bb502c54380cc44a4130660494679bb8 (patch) | |
| tree | 7d14962a86c24026ce2eee8f9e67db610db23fd8 /drivers/video/fbdev/sis | |
| parent | eaa1b01fe709d6a236a9cec74813e0400601fd23 (diff) | |
| parent | e81fdba0208666b65bafeaba814874b4d6e5edde (diff) | |
| download | linux-d4ea2bd1bb502c54380cc44a4130660494679bb8.tar.xz | |
Merge tag 'asoc-fix-v6.8-rc2-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.8
This pull request adds Richard Fitzgerald's series with extensive fixes
for the CS35L56, he said:
These patches fix various things that were undocumented, unknown or
uncertain when the original driver code was written. And also a few
things that were just bugs.
Diffstat (limited to 'drivers/video/fbdev/sis')
| -rw-r--r-- | drivers/video/fbdev/sis/sis_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/fbdev/sis/sis_main.c b/drivers/video/fbdev/sis/sis_main.c index 803ccb6aa479..009bf1d92644 100644 --- a/drivers/video/fbdev/sis/sis_main.c +++ b/drivers/video/fbdev/sis/sis_main.c @@ -1444,6 +1444,8 @@ sisfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) vtotal = var->upper_margin + var->lower_margin + var->vsync_len; + if (!var->pixclock) + return -EINVAL; pixclock = var->pixclock; if((var->vmode & FB_VMODE_MASK) == FB_VMODE_NONINTERLACED) { |