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>

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index d1ed9679c7177c12e3da8ffd1152c5ef11bbd139..3fca3e13ed6aee64be4b4509145f8f2a40cf5570 100644 (file)
--- 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;