Fix up references to firmware name in added log messages
svn path=/dists/trunk/linux/; revision=19647
This commit is contained in:
parent
df5911f385
commit
b065c3dab8
|
@ -39,7 +39,7 @@ removed in later patches.
|
||||||
case -1:
|
case -1:
|
||||||
+ dev_err(dev->parent,
|
+ dev_err(dev->parent,
|
||||||
+ "firmware: agent aborted loading %s (not found?)\n",
|
+ "firmware: agent aborted loading %s (not found?)\n",
|
||||||
+ fw_priv->fw_id);
|
+ fw_priv->buf->fw_id);
|
||||||
+ /* fallthrough */
|
+ /* fallthrough */
|
||||||
+ err:
|
+ err:
|
||||||
fw_load_abort(fw_priv);
|
fw_load_abort(fw_priv);
|
||||||
|
@ -51,7 +51,7 @@ removed in later patches.
|
||||||
|
|
||||||
+ dev_err(fw_priv->dev.parent,
|
+ dev_err(fw_priv->dev.parent,
|
||||||
+ "firmware: agent did not handle request for %s\n",
|
+ "firmware: agent did not handle request for %s\n",
|
||||||
+ fw_priv->fw_id);
|
+ fw_priv->buf->fw_id);
|
||||||
fw_load_abort(fw_priv);
|
fw_load_abort(fw_priv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -109,7 +109,7 @@ removed in later patches.
|
||||||
+ } else if (!buf->size) {
|
+ } else if (!buf->size) {
|
||||||
+ dev_err(f_dev->parent,
|
+ dev_err(f_dev->parent,
|
||||||
+ "firmware: agent loaded no data for %s (not found?)\n",
|
+ "firmware: agent loaded no data for %s (not found?)\n",
|
||||||
+ name);
|
+ buf->fw_id);
|
||||||
+ retval = -ENOENT;
|
+ retval = -ENOENT;
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue