Merge 5.4-rc6 into usb-next

[sfrench/cifs-2.6.git] / drivers / usb / storage / scsiglue.c

diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 54a3c8195c969785a6ab2a359a2787f321cce553..66a4dcbbb1fc9de2c5f160497926848ace8bb37a 100644 (file)
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -369,8 +369,8 @@ static int queuecommand_lck(struct scsi_cmnd *srb,
 
        /* check for state-transition errors */
        if (us->srb != NULL) {
-               printk(KERN_ERR "usb-storage: Error in %s: us->srb = %p\n",
-                       __func__, us->srb);
+               dev_err(&us->pusb_intf->dev,
+                       "Error in %s: us->srb = %p\n", __func__, us->srb);
                return SCSI_MLQUEUE_HOST_BUSY;
        }