Merge tag 'usb-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[karo-tx-linux.git] / drivers / usb / storage / debug.c

diff --git a/drivers/usb/storage/debug.c b/drivers/usb/storage/debug.c
index 05bc379b9e62a229c0a73b9b9e2cf49144eed316..57bf3ad41fb63554ac4ea0bf52b87919e75e3768 100644 (file)
--- a/drivers/usb/storage/debug.c
+++ b/drivers/usb/storage/debug.c
@@ -164,10 +164,10 @@ void usb_stor_show_sense(const struct us_data *us,
                         unsigned char asc,
                         unsigned char ascq)
 {
-       const char *what, *keystr;
+       const char *what, *keystr, *fmt;
 
        keystr = scsi_sense_key_string(key);
-       what = scsi_extd_sense_format(asc, ascq);
+       what = scsi_extd_sense_format(asc, ascq, &fmt);
 
        if (keystr == NULL)
                keystr = "(Unknown Key)";
@@ -175,8 +175,10 @@ void usb_stor_show_sense(const struct us_data *us,
                what = "(unknown ASC/ASCQ)";
 
        usb_stor_dbg(us, "%s: ", keystr);
-       US_DEBUGPX(what, ascq);
-       US_DEBUGPX("\n");
+       if (fmt)
+               US_DEBUGPX("%s (%s%x)\n", what, fmt, ascq);
+       else
+               US_DEBUGPX("%s\n", what);
 }
 
 void usb_stor_dbg(const struct us_data *us, const char *fmt, ...)
@@ -185,7 +187,7 @@ void usb_stor_dbg(const struct us_data *us, const char *fmt, ...)
 
        va_start(args, fmt);
 
-       dev_vprintk_emit(7, &us->pusb_dev->dev, fmt, args);
+       dev_vprintk_emit(LOGLEVEL_DEBUG, &us->pusb_dev->dev, fmt, args);
 
        va_end(args);
 }