diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-08-06 19:26:47 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-08-06 19:26:47 +0200 |
| commit | 653f0c8bade3afa975b9223d59323bc09db09cb1 (patch) | |
| tree | 3228f8140345b555ba666369c0fd5a74ac699f50 | |
| parent | Merge remote-tracking branch 'scsi-queue/drivers-for-3.17' into for-next (diff) | |
| parent | scsi: fix u14-34f printk format warnings (diff) | |
| download | linux-653f0c8bade3afa975b9223d59323bc09db09cb1.tar.xz linux-653f0c8bade3afa975b9223d59323bc09db09cb1.zip | |
Merge remote-tracking branch 'scsi-queue/core-for-3.17' into for-next
| -rw-r--r-- | drivers/scsi/u14-34f.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c index 4e76fe863fc4..d8dcf36aed11 100644 --- a/drivers/scsi/u14-34f.c +++ b/drivers/scsi/u14-34f.c @@ -1006,7 +1006,7 @@ static int port_detect \ sh[j]->irq, dma_name, sh[j]->sg_tablesize, sh[j]->can_queue); if (sh[j]->max_id > 8 || sh[j]->max_lun > 8) - printk("%s: wide SCSI support enabled, max_id %u, max_lun %u.\n", + printk("%s: wide SCSI support enabled, max_id %u, max_lun %llu.\n", BN(j), sh[j]->max_id, sh[j]->max_lun); for (i = 0; i <= sh[j]->max_channel; i++) @@ -1285,7 +1285,7 @@ static int u14_34f_queuecommand_lck(struct scsi_cmnd *SCpnt, void (*done)(struct cpp->cpp_index = i; SCpnt->host_scribble = (unsigned char *) &cpp->cpp_index; - if (do_trace) printk("%s: qcomm, mbox %d, target %d.%d:%llu.\n", + if (do_trace) printk("%s: qcomm, mbox %d, target %d.%d:%u.\n", BN(j), i, SCpnt->device->channel, SCpnt->device->id, (u8)SCpnt->device->lun); |