lkml.org 
[lkml]   [2022]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 189/196] i2c: qcom-cci: dont delete an unregistered adapter
    Date
    From: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>

    commit a0d48505a1d68e27220369e2dd1e3573a2f362d2 upstream.

    If i2c_add_adapter() fails to add an I2C adapter found on QCOM CCI
    controller, on error path i2c_del_adapter() is still called.

    Fortunately there is a sanity check in the I2C core, so the only
    visible implication is a printed debug level message:

    i2c-core: attempting to delete unregistered adapter [Qualcomm-CCI]

    Nevertheless it would be reasonable to correct the probe error path.

    Fixes: e517526195de ("i2c: Add Qualcomm CCI I2C driver")
    Signed-off-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
    Reviewed-by: Robert Foss <robert.foss@linaro.org>
    Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Wolfram Sang <wsa@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/i2c/busses/i2c-qcom-cci.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/i2c/busses/i2c-qcom-cci.c
    +++ b/drivers/i2c/busses/i2c-qcom-cci.c
    @@ -655,7 +655,7 @@ static int cci_probe(struct platform_dev
    return 0;

    error_i2c:
    - for (; i >= 0; i--) {
    + for (--i ; i >= 0; i--) {
    if (cci->master[i].cci)
    i2c_del_adapter(&cci->master[i].adap);
    }

    \
     
     \ /
      Last update: 2022-02-21 19:21    [W:4.280 / U:3.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site