ALSA: isight: fix leak of reference to firewire unit in error path of…

… .probe callback [ Upstream commit 51e68fb ] In some error paths, reference count of firewire unit is not decreased. This commit fixes the bug. Fixes: 5b14ec2('ALSA: firewire: release reference count of firewire unit in .remove callback of bus driver') Signed-off-by: Takashi Sakamoto <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
yesimxev · Nov 28, 2019 · d1f08bc · d1f08bc
1 parent 9c8e98a
commit d1f08bc
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
@@ -639,7 +639,7 @@ static int isight_probe(struct fw_unit *unit,
 	if (!isight->audio_base) {
 		dev_err(&unit->device, "audio unit base not found\n");
 		err = -ENXIO;
-		goto err_unit;
+		goto error;
 	}
 	fw_iso_resources_init(&isight->resources, unit);
 
@@ -668,12 +668,12 @@ static int isight_probe(struct fw_unit *unit,
 	dev_set_drvdata(&unit->device, isight);
 
 	return 0;
-
-err_unit:
-	fw_unit_put(isight->unit);
-	mutex_destroy(&isight->mutex);
 error:
 	snd_card_free(card);
+
+	mutex_destroy(&isight->mutex);
+	fw_unit_put(isight->unit);
+
 	return err;
 }