aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2012-12-24 02:50:14 +0000
committerBen Hutchings <benh@debian.org>2012-12-24 02:50:14 +0000
commitb065c3dab8f6f6539864eca33e3e2141fc8093b8 (patch)
treef15aaff071e5a11acabec2371a706d9211fdec19
parentdf5911f38560ea94124fcc1492480e44cb04d87d (diff)
downloadkernel_replicant_linux-b065c3dab8f6f6539864eca33e3e2141fc8093b8.tar.gz
kernel_replicant_linux-b065c3dab8f6f6539864eca33e3e2141fc8093b8.tar.bz2
kernel_replicant_linux-b065c3dab8f6f6539864eca33e3e2141fc8093b8.zip
Fix up references to firmware name in added log messages
svn path=/dists/trunk/linux/; revision=19647
-rw-r--r--debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch b/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch
index d72367ba907d..2f5fcb338dfc 100644
--- a/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch
+++ b/debian/patches/bugfix/all/firmware_class-log-every-success-and-failure.patch
@@ -39,7 +39,7 @@ removed in later patches.
case -1:
+ dev_err(dev->parent,
+ "firmware: agent aborted loading %s (not found?)\n",
-+ fw_priv->fw_id);
++ fw_priv->buf->fw_id);
+ /* fallthrough */
+ err:
fw_load_abort(fw_priv);
@@ -51,7 +51,7 @@ removed in later patches.
+ dev_err(fw_priv->dev.parent,
+ "firmware: agent did not handle request for %s\n",
-+ fw_priv->fw_id);
++ fw_priv->buf->fw_id);
fw_load_abort(fw_priv);
}
@@ -109,7 +109,7 @@ removed in later patches.
+ } else if (!buf->size) {
+ dev_err(f_dev->parent,
+ "firmware: agent loaded no data for %s (not found?)\n",
-+ name);
++ buf->fw_id);
+ retval = -ENOENT;
+ }