commit 4862649f16e79299b4f82a8e13dd8f9e5abcaa25
author Linus Torvalds <torvalds@linux-foundation.org> Mon Oct 25 09:57:28 2021 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Oct 25 09:57:28 2021 -0700
tree 9b046488e4490bdce02798eff7b8b4a40f615a3a
parent a51aec4109300d843bf144579109d5288856f72a
parent a0023bb9dd9bc439d44604eeec62426a990054cd

Merge tag 'libata-5.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata

Pull libata fix from Damien Le Moal:
 "A single fix in this pull request addressing an invalid error code
  return in the sata_mv driver (from Zheyu)"

* tag 'libata-5.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  ata: sata_mv: Fix the error handling of mv_chip_id()

drivers/ata/sata_mv.c

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 9d86203..c53633d 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -3896,8 +3896,8 @@
 		break;
 
 	default:
-		dev_err(host->dev, "BUG: invalid board index %u\n", board_idx);
-		return 1;
+		dev_alert(host->dev, "BUG: invalid board index %u\n", board_idx);
+		return -EINVAL;
 	}
 
 	hpriv->hp_flags = hp_flags;