Merge branch 'v5.7' into v5.8

2020-09-09 03:34:47 +01:00 · 2020-09-09 03:34:47 +01:00 · bcdc10e193
commit bcdc10e193
parent ec5fc9d9b8 ebb9a9d82a
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -150,6 +150,6 @@ fi
 alsactl restore

 #Force 3.5mm ('headphone') jack
-if [[ "$kernel_ver" =~ ^4\.*$ ]]; then
+if aplay -l | grep -q "bcm2835 ALSA"; then
    amixer cset numid=3 1 || true
 fi