ASoC: mchp-spdifrx: fix return value in case completion times out
authorClaudiu Beznea <claudiu.beznea@microchip.com>
Mon, 30 Jan 2023 12:06:41 +0000 (14:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Mar 2023 08:33:18 +0000 (09:33 +0100)
[ Upstream commit a4c4161d6eae3ef5f486d1638ef452d9bc1376b0 ]

wait_for_completion_interruptible_timeout() returns 0 in case of
timeout. Check this into account when returning from function.

Fixes: ef265c55c1ac ("ASoC: mchp-spdifrx: add driver for SPDIF RX")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20230130120647.638049-3-claudiu.beznea@microchip.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/atmel/mchp-spdifrx.c

index 2d86e0ec930fa5076b4ad631bc200be85a5cceca..7f359371b31bff0cddbc1c437a9073741619842f 100644 (file)
@@ -524,9 +524,10 @@ static int mchp_spdifrx_cs_get(struct mchp_spdifrx_dev *dev,
        ret = wait_for_completion_interruptible_timeout(&ch_stat->done,
                                                        msecs_to_jiffies(100));
        /* IP might not be started or valid stream might not be present */
-       if (ret < 0) {
+       if (ret <= 0) {
                dev_dbg(dev->dev, "channel status for channel %d timeout\n",
                        channel);
+               return ret ? : -ETIMEDOUT;
        }
 
        memcpy(uvalue->value.iec958.status, ch_stat->data,
@@ -580,7 +581,7 @@ static int mchp_spdifrx_subcode_ch_get(struct mchp_spdifrx_dev *dev,
                dev_dbg(dev->dev, "user data for channel %d timeout\n",
                        channel);
                mchp_spdifrx_isr_blockend_dis(dev);
-               return ret;
+               return ret ? : -ETIMEDOUT;
        }
 
        spin_lock_irqsave(&user_data->lock, flags);