From 0372b9c10a0c292080563ab9a339f2f059ea859d Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Thu, 5 Nov 2020 14:18:03 +0100 Subject: [PATCH] Fix 5.9.5 compilation --- PKGBUILD | 2 +- .../5.9/0003-glitched-base.patch | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index fd133ab..3367a4d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -267,7 +267,7 @@ case $_basever in '66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997' 'f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6' '35a7cde86fb94939c0f25a62b8c47f3de0dbd3c65f876f460b263181b3e92fc0' - '902885088ed0748e40372e04a8ec11adf5acf3d935abffc6737dd9e6ec13bb93' + 'bcac25553eb7e6319b5f89e92039806468b19ce8d3e7ca811e63e7c91aa8fa38' '7058e57fd68367b029adc77f2a82928f1433daaf02c8c279cb2d13556c8804d7' 'c605f638d74c61861ebdc36ebd4cb8b6475eae2f6273e1ccb2bbb3e10a2ec3fe' '2bbbac963b6ca44ef3f8a71ec7c5cad7d66df860869a73059087ee236775970a' diff --git a/linux-tkg-patches/5.9/0003-glitched-base.patch b/linux-tkg-patches/5.9/0003-glitched-base.patch index e321500..12b3ffe 100644 --- a/linux-tkg-patches/5.9/0003-glitched-base.patch +++ b/linux-tkg-patches/5.9/0003-glitched-base.patch @@ -767,3 +767,25 @@ index 6f12bab4d2fa..610ed0817bd7 100644 hci_find_irk_by_addr(hdev, &b->bdaddr, b->bdaddr_type)) { return 0x00; } +diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c +index 2c5c451fa19d7..c475955c6eeba 100644 +--- a/sound/soc/sof/intel/hda-codec.c ++++ b/sound/soc/sof/intel/hda-codec.c +@@ -151,7 +151,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address, + if (!hdev->bus->audio_component) { + dev_dbg(sdev->dev, + "iDisp hw present but no driver\n"); +- goto error; ++ return -ENOENT; + } + hda_priv->need_display_power = true; + } +@@ -174,7 +174,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address, + * other return codes without modification + */ + if (ret == 0) +- goto error; ++ ret = -ENOENT; + } + + return ret;