Commit 8078efff authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

misc: bcm-vk: Fix a couple error codes in probe() 



These errors should return negative error codes instead of returning
success.

Fixes: 064ffc7c ("misc: bcm-vk: add autoload support")
Fixes: 522f6926 ("misc: bcm-vk: add Broadcom VK driver")
Acked-by: default avatarScott Branden <scott.branden@broadcom.com>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/YBpyEbmz00rjvT9S@mwanda


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 94e6a5b9

drivers/misc/bcm-vk/bcm_vk_dev.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -1358,6 +1358,7 @@ static int bcm_vk_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		vk->bar[i] = pci_ioremap_bar(pdev, i * 2);

		vk->bar[i] = pci_ioremap_bar(pdev, i * 2);

		if (!vk->bar[i]) {

		if (!vk->bar[i]) {

			dev_err(dev, "failed to remap BAR%d\n", i);

			dev_err(dev, "failed to remap BAR%d\n", i);

			err = -ENOMEM;

			goto err_iounmap;

			goto err_iounmap;

		}

		}

	}

	}
@@ -1463,7 +1464,8 @@ static int bcm_vk_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	boot_status = vkread32(vk, BAR_0, BAR_BOOT_STATUS);

	boot_status = vkread32(vk, BAR_0, BAR_BOOT_STATUS);

	if (auto_load) {

	if (auto_load) {

		if ((boot_status & BOOT_STATE_MASK) == BROM_RUNNING) {

		if ((boot_status & BOOT_STATE_MASK) == BROM_RUNNING) {

			if (bcm_vk_trigger_autoload(vk))

			err = bcm_vk_trigger_autoload(vk);

			if (err)

				goto err_bcm_vk_tty_exit;

				goto err_bcm_vk_tty_exit;

		} else {

		} else {

			dev_err(dev,

			dev_err(dev,