ALSA: atmel_abdac: clk_round_rate() can return a zero upon error
Subsystems (2)
PATCH 1/1 ALSA: atmel_abdac: clk_round_rate() can return a zero upon error
Treat both negative and zero return values from clk_round_rate() as errors. This is needed since subsequent patches will convert clk_round_rate()'s return value to be an unsigned type, rather than a signed type, since some clock sources can generate rates higher than (2^31)-1 Hz.
Eventually, when calling clk_round_rate(), only a return value of zero will be considered a error; all other values will be considered valid rates. The comparison against values less than 0 is kept to preserve the correct behavior in the meantime.
---
Applies on v3.13-rc3. See also:
http://marc.info/?l=linux-arm-kernel&m=138542591313620&w=2
sound/atmel/abdac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/atmel/abdac.c +1 -1
@@ -354,7 +354,7 @@ static int set_sample_rates(struct atmel_abdac *dac)/* we start at 192 kHz and work our way down to 5112 Hz */ while (new_rate >=RATE_MIN && index < (MAX_NUM_RATES +1 )) { new_rate =clk_round_rate (dac->sample_clk,256 * new_rate); -if (new_rate <0 ) +if (new_rate <=0 )break ;/* make sure we are below the ABDAC clock */ if (index < MAX_NUM_RATES &&
Quoted 12 lines · Paul Walmsley
Treat both negative and zero return values from
clk_round_rate()as errors. This is needed since subsequent patches will convert clk_round_rate()'s return value to be an unsigned type, rather than a signed type, since some clock sources can generate rates higher than (2^31)-1 Hz.Eventually, when calling
clk_round_rate(), only a return value of zero will be considered a error; all other values will be considered valid rates. The comparison against values less than 0 is kept to preserve the correct behavior in the meantime.
Quoted 5 lines
Signed-off-by Paul Walmsley <[email protected]>Cc Hans-Christian Egtvedt <[email protected]>Cc Nicolas Ferre <[email protected]>Cc Takashi Iwai <[email protected]>Cc Jaroslav Kysela <[email protected]>
Thanks for fixing.
Quoted 22 lines
---
Applies on v3.13-rc3. See also:http://marc.info/?l=linux-arm-kernel&m=138542591313620&w=2
sound/atmel/abdac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)sound/atmel/abdac.c +1
-1@@ -354,7 +354,7 @@ static int set_sample_rates(struct atmel_abdac *dac)/* we start at 192 kHz and work our way down to 5112 Hz */ while (new_rate >=RATE_MIN && index < (MAX_NUM_RATES +1 )) { new_rate =clk_round_rate (dac->sample_clk,256 * new_rate); -if (new_rate <0 ) +if (new_rate <=0 )break ;/* make sure we are below the ABDAC clock */ if (index < MAX_NUM_RATES &&
Signature · 2 lines
mvh Hans-Christian Egtvedt