diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-03-21 14:07:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-03-21 14:07:27 +0100 |
| commit | 9f2347842b526cbc2655068591fb0166362d2999 (patch) | |
| tree | 1d8e00f652520f1bb1036b1182920e1900a916e8 /drivers/video/fbdev/hyperv_fb.c | |
| parent | 14d811467f6592aa0e685730e66b5f9123287468 (diff) | |
| parent | 9a8b202f8cb7ebebc71f1f2a353a21c76d3063a8 (diff) | |
| download | linux-9f2347842b526cbc2655068591fb0166362d2999.tar.gz | |
Merge tag 'asoc-fix-v6.9-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.9
A bunch of fixes that came in during the merge window, probably the most
substantial thing is the DPCM locking fix for compressed audio which has
been lurking for a while.
Diffstat (limited to 'drivers/video/fbdev/hyperv_fb.c')
| -rw-r--r-- | drivers/video/fbdev/hyperv_fb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index c26ee6fd73c9b..8fdccf033b2d9 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c @@ -1010,8 +1010,6 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) goto getmem_done; } pr_info("Unable to allocate enough contiguous physical memory on Gen 1 VM. Using MMIO instead.\n"); - } else { - goto err1; } /* |