lkml.org 
[lkml]   [2023]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 9/9] ALSA: hda/cs35l56: Reject I2C alias addresses
    Date
    The ACPI nodes for CS35L56 can contain an extra I2CSerialBusV2 that
    is not a real device, it is an alias address.

    This alias address will not be in the cirrus,dev-index array, so reject
    any instantions with a device address not found in the array.

    Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
    ---
    sound/pci/hda/cs35l56_hda.c | 13 ++++++++-----
    1 file changed, 8 insertions(+), 5 deletions(-)

    diff --git a/sound/pci/hda/cs35l56_hda.c b/sound/pci/hda/cs35l56_hda.c
    index 004740509dbd..76b9c685560b 100644
    --- a/sound/pci/hda/cs35l56_hda.c
    +++ b/sound/pci/hda/cs35l56_hda.c
    @@ -852,8 +852,12 @@ static int cs35l56_hda_read_acpi(struct cs35l56_hda *cs35l56, int id)
    break;
    }
    }
    + /*
    + * It's not an error for the ID to be missing: for I2C there can be
    + * an alias address that is not a real device. So reject silently.
    + */
    if (cs35l56->index == -1) {
    - dev_err(cs35l56->base.dev, "No index found in %s\n", property);
    + dev_dbg(cs35l56->base.dev, "No index found in %s\n", property);
    ret = -ENODEV;
    goto err;
    }
    @@ -891,7 +895,8 @@ static int cs35l56_hda_read_acpi(struct cs35l56_hda *cs35l56, int id)
    return 0;

    err:
    - dev_err(cs35l56->base.dev, "Failed property %s: %d\n", property, ret);
    + if (ret != -ENODEV)
    + dev_err(cs35l56->base.dev, "Failed property %s: %d\n", property, ret);

    return ret;
    }
    @@ -904,10 +909,8 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int id)
    dev_set_drvdata(cs35l56->base.dev, cs35l56);

    ret = cs35l56_hda_read_acpi(cs35l56, id);
    - if (ret) {
    - dev_err_probe(cs35l56->base.dev, ret, "Platform not supported\n");
    + if (ret)
    goto err;
    - }

    cs35l56->amp_name = devm_kasprintf(cs35l56->base.dev, GFP_KERNEL, "AMP%d",
    cs35l56->index + 1);
    --
    2.30.2
    \
     
     \ /
      Last update: 2023-07-31 18:59    [W:5.307 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site