From 3c0774cf8f4cfef2afe9ef2b2ba5b072b20d6bfb Mon Sep 17 00:00:00 2001 From: lean Date: Wed, 17 Aug 2022 23:45:26 +0800 Subject: [PATCH] mt76: mt7921e: fix crash in chip reset fail on rockchip 5.19 kernel --- ...10.bypass-werror.patch => 010-bypass-werror.patch} | 0 .../patches/020-fix-crash-in-chip-reset-fail.patch | 11 +++++++++++ ...ux-5.19.patch => 090-backport-to-linux-5.19.patch} | 0 3 files changed, 11 insertions(+) rename package/kernel/mt76/patches/{010.bypass-werror.patch => 010-bypass-werror.patch} (100%) create mode 100644 package/kernel/mt76/patches/020-fix-crash-in-chip-reset-fail.patch rename package/kernel/mt76/patches/{090.backport-to-linux-5.19.patch => 090-backport-to-linux-5.19.patch} (100%) diff --git a/package/kernel/mt76/patches/010.bypass-werror.patch b/package/kernel/mt76/patches/010-bypass-werror.patch similarity index 100% rename from package/kernel/mt76/patches/010.bypass-werror.patch rename to package/kernel/mt76/patches/010-bypass-werror.patch diff --git a/package/kernel/mt76/patches/020-fix-crash-in-chip-reset-fail.patch b/package/kernel/mt76/patches/020-fix-crash-in-chip-reset-fail.patch new file mode 100644 index 000000000..2777d142e --- /dev/null +++ b/package/kernel/mt76/patches/020-fix-crash-in-chip-reset-fail.patch @@ -0,0 +1,11 @@ +--- a/mt7921/pci_mac.c ++++ b/mt7921/pci_mac.c +@@ -261,7 +261,7 @@ int mt7921e_mac_reset(struct mt7921_dev *dev) + + err = mt7921e_driver_own(dev); + if (err) +- return err; ++ goto out; + + err = mt7921_run_firmware(dev); + if (err) diff --git a/package/kernel/mt76/patches/090.backport-to-linux-5.19.patch b/package/kernel/mt76/patches/090-backport-to-linux-5.19.patch similarity index 100% rename from package/kernel/mt76/patches/090.backport-to-linux-5.19.patch rename to package/kernel/mt76/patches/090-backport-to-linux-5.19.patch