mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-02 23:47:49 +00:00
linux (Generic/Allwinner): update to linux-5.4.6
This commit is contained in:
parent
88b8913471
commit
6d8b233438
@ -29,8 +29,8 @@ case "$LINUX" in
|
||||
PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
|
||||
;;
|
||||
*)
|
||||
PKG_VERSION="5.4.5"
|
||||
PKG_SHA256="568e9f27fbba86131c2e2849f296d54216e2ed3e8c4d8aa78a93b417cab23ec0"
|
||||
PKG_VERSION="5.4.6"
|
||||
PKG_SHA256="fda561bcdea397ddd59656319c53871002938b19b554f30efed90affa30989c8"
|
||||
PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_PATCH_DIRS="default"
|
||||
;;
|
||||
|
@ -1,29 +0,0 @@
|
||||
diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c
|
||||
index f9707fb05efe..682ed39f79b0 100644
|
||||
--- a/sound/hda/hdac_stream.c
|
||||
+++ b/sound/hda/hdac_stream.c
|
||||
@@ -120,10 +120,8 @@ void snd_hdac_stream_clear(struct hdac_stream *azx_dev)
|
||||
snd_hdac_stream_updateb(azx_dev, SD_CTL,
|
||||
SD_CTL_DMA_START | SD_INT_MASK, 0);
|
||||
snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK); /* to be sure */
|
||||
- if (azx_dev->stripe) {
|
||||
+ if (azx_dev->stripe)
|
||||
snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK, 0);
|
||||
- azx_dev->stripe = 0;
|
||||
- }
|
||||
azx_dev->running = false;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(snd_hdac_stream_clear);
|
||||
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
|
||||
index 78647ee02339..630b1f5c276d 100644
|
||||
--- a/sound/pci/hda/patch_hdmi.c
|
||||
+++ b/sound/pci/hda/patch_hdmi.c
|
||||
@@ -2021,6 +2021,8 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,
|
||||
per_cvt->assigned = 0;
|
||||
hinfo->nid = 0;
|
||||
|
||||
+ azx_stream(get_azx_dev(substream))->stripe = 0;
|
||||
+
|
||||
mutex_lock(&spec->pcm_lock);
|
||||
snd_hda_spdif_ctls_unassign(codec, pcm_idx);
|
||||
clear_bit(pcm_idx, &spec->pcm_in_use);
|
Loading…
x
Reference in New Issue
Block a user