Skip to contentSkip to conversation

ALSA: firewire-motu: fix error return code in snd_motu_stream_reserve_duplex()

PATCH Applied Yang Yingliang 3 participants 3 messages Jun 3, 2021 – Jun 4, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: firewire-motu: fix error return code in snd_motu_stream_reserve_duplex()

Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.

Fixes e50dfac81f73 ("ALSA: firewire-motu: cache event ticks in source packet header per data block")
---
 sound/firewire/motu/motu-stream.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/firewire/motu/motu-stream.c +1 -1
index 43ff5be32b15..9e6ca39ebd7f 100644
@@ -191,7 +191,7 @@ int snd_motu_stream_reserve_duplex(struct snd_motu *motu, unsigned int rate,
 		if (!motu->cache.event_offsets) {
 			fw_iso_resources_free(&motu->tx_resources);
 			fw_iso_resources_free(&motu->rx_resources);
-			return err;
+			return -ENOMEM;
 		}
 	}
 
Signature · 1 line
2.25.1
maintainer Acked-by on v1 1/1
#1 lore raw

Hi,

Quoted 25 lines · Yang Yingliang

Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.

Fixes e50dfac81f73 ("ALSA: firewire-motu: cache event ticks in source packet header per data block")
---
 sound/firewire/motu/motu-stream.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/firewire/motu/motu-stream.c +1 -1
index 43ff5be32b15..9e6ca39ebd7f 100644
@@ -191,7 +191,7 @@ int snd_motu_stream_reserve_duplex(struct snd_motu *motu, unsigned int rate,
 		if (!motu->cache.event_offsets) {
 			fw_iso_resources_free(&motu->tx_resources);
 			fw_iso_resources_free(&motu->rx_resources);
-			return err;
+			return -ENOMEM;
 		}
 	}
 
Signature · 1 line
2.25.1

Indeed. Nice to catch it.

Thanks

Takashi Sakamoto