Merge tag 'for-linus-20140905' of git://git.infradead.org/linux-mtd

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / scsi_proc.c

diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c
index 86f0c5d5c116f74d2117806e45ec4599d750837a..6fcefa2da503f17faf6a2a1679f2154fa05c70bd 100644 (file)
--- a/drivers/scsi/scsi_proc.c
+++ b/drivers/scsi/scsi_proc.c
@@ -185,7 +185,7 @@ static int proc_print_scsidevice(struct device *dev, void *data)
 
        sdev = to_scsi_device(dev);
        seq_printf(s,
-               "Host: scsi%d Channel: %02d Id: %02d Lun: %02d\n  Vendor: ",
+               "Host: scsi%d Channel: %02d Id: %02d Lun: %02llu\n  Vendor: ",
                sdev->host->host_no, sdev->channel, sdev->id, sdev->lun);
        for (i = 0; i < 8; i++) {
                if (sdev->vendor[i] >= 0x20)