lkml.org 
[lkml]   [2011]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 5/7] ASoC: SigmaDSP: Provide diagnostic error messages
    Date
    Provide some error messages when loading the firmware fails, so it is possible
    to diagnose the reason for the failure.

    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>

    ---
    Changes since v1:
    * Don't split error message string across multiple lines.
    ---
    sound/soc/codecs/sigmadsp.c | 13 ++++++++++---
    1 files changed, 10 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/codecs/sigmadsp.c b/sound/soc/codecs/sigmadsp.c
    index acb97a9..c0ad885 100644
    --- a/sound/soc/codecs/sigmadsp.c
    +++ b/sound/soc/codecs/sigmadsp.c
    @@ -124,18 +124,25 @@ int process_sigma_firmware(struct i2c_client *client, const char *name)
    * purposes and having the limit makes it easier to avoid integer
    * overflows later in the loading process.
    */
    - if (fw->size < sizeof(*ssfw_head) || fw->size >= 0x4000000)
    + if (fw->size < sizeof(*ssfw_head) || fw->size >= 0x4000000) {
    + dev_err(&client->dev, "Failed to load firmware: Invalid size\n");
    goto done;
    + }

    ssfw_head = (void *)fw->data;
    - if (memcmp(ssfw_head->magic, SIGMA_MAGIC, ARRAY_SIZE(ssfw_head->magic)))
    + if (memcmp(ssfw_head->magic, SIGMA_MAGIC, ARRAY_SIZE(ssfw_head->magic))) {
    + dev_err(&client->dev, "Failed to load firmware: Invalid magic\n");
    goto done;
    + }

    crc = crc32(0, fw->data + sizeof(*ssfw_head),
    fw->size - sizeof(*ssfw_head));
    pr_debug("%s: crc=%x\n", __func__, crc);
    - if (crc != le32_to_cpu(ssfw_head->crc))
    + if (crc != le32_to_cpu(ssfw_head->crc)) {
    + dev_err(&client->dev, "Failed to load firmware: Wrong crc checksum: expected %x got %x\n",
    + le32_to_cpu(ssfw_head->crc), crc);
    goto done;
    + }

    ssfw.pos = sizeof(*ssfw_head);

    --
    1.7.7.3



    \
     
     \ /
      Last update: 2011-11-28 09:45    [W:0.042 / U:0.128 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site