lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 071/800] bus: mhi: pci-generic: Add missing pci_disable_pcie_error_reporting() calls
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    commit a25d144fb883c73506ba384de476bbaff8220a95 upstream.

    If an error occurs after a 'pci_enable_pcie_error_reporting()' call, it
    must be undone by a corresponding 'pci_disable_pcie_error_reporting()'
    call

    Add the missing call in the error handling path of the probe and in the
    remove function.

    Cc: <stable@vger.kernel.org>
    Fixes: b012ee6bfe2a ("mhi: pci_generic: Add PCI error handlers")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
    Link: https://lore.kernel.org/r/f70c14701f4922d67e717633c91b6c481b59f298.1623445348.git.christophe.jaillet@wanadoo.fr
    Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
    Link: https://lore.kernel.org/r/20210621161616.77524-6-manivannan.sadhasivam@linaro.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/bus/mhi/pci_generic.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/drivers/bus/mhi/pci_generic.c
    +++ b/drivers/bus/mhi/pci_generic.c
    @@ -665,7 +665,7 @@ static int mhi_pci_probe(struct pci_dev

    err = mhi_register_controller(mhi_cntrl, mhi_cntrl_config);
    if (err)
    - return err;
    + goto err_disable_reporting;

    /* MHI bus does not power up the controller by default */
    err = mhi_prepare_for_power_up(mhi_cntrl);
    @@ -699,6 +699,8 @@ err_unprepare:
    mhi_unprepare_after_power_down(mhi_cntrl);
    err_unregister:
    mhi_unregister_controller(mhi_cntrl);
    +err_disable_reporting:
    + pci_disable_pcie_error_reporting(pdev);

    return err;
    }
    @@ -721,6 +723,7 @@ static void mhi_pci_remove(struct pci_de
    pm_runtime_get_noresume(&pdev->dev);

    mhi_unregister_controller(mhi_cntrl);
    + pci_disable_pcie_error_reporting(pdev);
    }

    static void mhi_pci_shutdown(struct pci_dev *pdev)

    \
     
     \ /
      Last update: 2021-07-12 10:41    [W:5.076 / U:0.452 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site