Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome...

[cascardo/linux.git] / drivers / scsi / eata.c

diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index ebf5736..813dd5c 100644 (file)
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -1238,8 +1238,8 @@ static int port_detect(unsigned long port_base, unsigned int j,
                struct eata_config *cf;
                dma_addr_t cf_dma_addr;
 
-               cf = pci_alloc_consistent(pdev, sizeof(struct eata_config),
-                                         &cf_dma_addr);
+               cf = pci_zalloc_consistent(pdev, sizeof(struct eata_config),
+                                          &cf_dma_addr);
 
                if (!cf) {
                        printk
@@ -1249,7 +1249,6 @@ static int port_detect(unsigned long port_base, unsigned int j,
                }
 
                /* Set board configuration */
-               memset((char *)cf, 0, sizeof(struct eata_config));
                cf->len = (ushort) H2DEV16((ushort) 510);
                cf->ocena = 1;
 
@@ -1399,7 +1398,7 @@ static int port_detect(unsigned long port_base, unsigned int j,
 
        if (shost->max_id > 8 || shost->max_lun > 8)
                printk
-                   ("%s: wide SCSI support enabled, max_id %u, max_lun %u.\n",
+                   ("%s: wide SCSI support enabled, max_id %u, max_lun %llu.\n",
                     ha->board_name, shost->max_id, shost->max_lun);
 
        for (i = 0; i <= shost->max_channel; i++)
@@ -2449,7 +2448,7 @@ static irqreturn_t ihdlr(struct Scsi_Host *shost)
                               "target_status 0x%x, sense key 0x%x.\n",
                               ha->board_name,
                               SCpnt->device->channel, SCpnt->device->id,
-                              SCpnt->device->lun,
+                              (u8)SCpnt->device->lun,
                               spp->target_status, SCpnt->sense_buffer[2]);
 
                ha->target_to[SCpnt->device->id][SCpnt->device->channel] = 0;