From 49b6ae283de52f66720d4e0db7faf6baf0c1c45d Mon Sep 17 00:00:00 2001 From: Aleksandr Mezin Date: Fri, 18 Jun 2021 11:52:19 +0600 Subject: [PATCH] pwmconfig, fancontrol: Allow read-only pwm*_enable Don't fail if pwm*_enable is read-only, but already set to 1. --- prog/pwm/fancontrol | 4 ++-- prog/pwm/pwmconfig | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/prog/pwm/fancontrol b/prog/pwm/fancontrol index 886a7367..89c66687 100755 --- a/prog/pwm/fancontrol +++ b/prog/pwm/fancontrol @@ -489,8 +489,8 @@ function pwmenable() PWM_ORIG_STATE[${1}]=$PWM_ORIG fi # enable manual control by fancontrol - echo 1 > $ENABLE 2> /dev/null - if [ $? -ne 0 ] + (echo 1 > $ENABLE) 2> /dev/null + if [ "$(cat $ENABLE)" -ne 1 ] then return 1 fi diff --git a/prog/pwm/pwmconfig b/prog/pwm/pwmconfig index edcbde9e..cc1139f9 100755 --- a/prog/pwm/pwmconfig +++ b/prog/pwm/pwmconfig @@ -214,14 +214,12 @@ function pwmenable() { local ENABLE=${1}_enable - if [ -w $ENABLE ] + (echo 1 > $ENABLE) 2>/dev/null + if [ "$(cat $ENABLE)" -ne 1 ] then - echo 1 2>/dev/null > $ENABLE - if [ $? -ne 0 ] - then - return 1 - fi + return 1 fi + echo $MAX > $1 }