summaryrefslogtreecommitdiff
path: root/drivers/ata
diff options
context:
space:
mode:
authorZheyu Ma <zheyuma97@gmail.com>2021-10-22 09:12:26 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-11-02 17:38:11 +0100
commite215f19d81071a82692eea9358505ed191b2463d (patch)
tree97495cef55b418d77a5d5c5f8fe5fcccb86aa641 /drivers/ata
parent65695c85607034b23d54dccbe7a9bdbf38b94cbf (diff)
ata: sata_mv: Fix the error handling of mv_chip_id()
commit a0023bb9dd9bc439d44604eeec62426a990054cd upstream. mv_init_host() propagates the value returned by mv_chip_id() which in turn gets propagated by mv_pci_init_one() and hits local_pci_probe(). During the process of driver probing, the probe function should return < 0 for failure, otherwise, the kernel will treat value > 0 as success. Since this is a bug rather than a recoverable runtime error we should use dev_alert() instead of dev_err(). Signed-off-by: Zheyu Ma <zheyuma97@gmail.com> Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/sata_mv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 601ea2e9fcf9..509f63891fb0 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -3909,8 +3909,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;