From 6bbbeedee01c70014047c37965fc782e2e9a0437 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Sun, 21 Aug 2011 19:56:51 -0300 Subject: [PATCH] --- yaml --- r: 271734 b: refs/heads/master c: d650fc30c0328eceb0e48f348e01e073b5a7f1f6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/gl860/gl860.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c3ce51119b6e..5ea73f4ed43a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 857011e4d9bf47b39abcc89541a58c56e4df34be +refs/heads/master: d650fc30c0328eceb0e48f348e01e073b5a7f1f6 diff --git a/trunk/drivers/media/video/gspca/gl860/gl860.c b/trunk/drivers/media/video/gspca/gl860/gl860.c index e8e071aa212f..2ced3b73994f 100644 --- a/trunk/drivers/media/video/gspca/gl860/gl860.c +++ b/trunk/drivers/media/video/gspca/gl860/gl860.c @@ -18,6 +18,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include "gspca.h" #include "gl860.h" @@ -572,9 +575,8 @@ int gl860_RTx(struct gspca_dev *gspca_dev, } if (r < 0) - err("ctrl transfer failed %4d " - "[p%02x r%d v%04x i%04x len%d]", - r, pref, req, val, index, len); + pr_err("ctrl transfer failed %4d [p%02x r%d v%04x i%04x len%d]\n", + r, pref, req, val, index, len); else if (len > 1 && r < len) PDEBUG(D_ERR, "short ctrl transfer %d/%d", r, len);