diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-25 09:57:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-25 09:57:28 -0700 |
| commit | 4862649f16e79299b4f82a8e13dd8f9e5abcaa25 (patch) | |
| tree | 9b046488e4490bdce02798eff7b8b4a40f615a3a | |
| parent | a51aec4109300d843bf144579109d5288856f72a (diff) | |
| parent | a0023bb9dd9bc439d44604eeec62426a990054cd (diff) | |
| download | lwn-4862649f16e79299b4f82a8e13dd8f9e5abcaa25.tar.gz lwn-4862649f16e79299b4f82a8e13dd8f9e5abcaa25.zip | |
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()
| -rw-r--r-- | drivers/ata/sata_mv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 9d86203e1e7a..c53633d47bfb 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -3896,8 +3896,8 @@ static int mv_chip_id(struct ata_host *host, unsigned int board_idx) 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; |