Commit 4862649f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents a51aec41 a0023bb9

drivers/ata/sata_mv.c

+2 −2
Original line number Diff line number Diff line
@@ -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;