summaryrefslogtreecommitdiff
path: root/drivers/ata
diff options
context:
space:
mode:
authorZheyu Ma <zheyuma97@gmail.com>2021-10-22 12:12:26 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-11-02 21:48:19 +0300
commit5aa5bab579575452bc59f9626e1cd44b4cfbd373 (patch)
treeb65c41006d51b3878460a4008ad11437275d811f /drivers/ata
parent9a52798dce738020cef7e89ab3bbe5dee5f69a43 (diff)
downloadlinux-5aa5bab579575452bc59f9626e1cd44b4cfbd373.tar.xz
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 b62446ea5f40..11be88f70690 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -3892,8 +3892,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;