Merge branch 'v5.5' into v5.7

This commit is contained in:
Hin-Tak Leung 2020-09-09 03:34:14 +01:00
commit ebb9a9d82a

View file

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