diff options
-rw-r--r-- | drivers/scsi/scsi_error.c | 2 | ||||
-rw-r--r-- | drivers/scsi/scsi_scan.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 1a135f38e78d..2bf1ee2b47b6 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c | |||
@@ -584,7 +584,7 @@ static int scsi_request_sense(struct scsi_cmnd *scmd) | |||
584 | 584 | ||
585 | memcpy(scmd->cmnd, generic_sense, sizeof(generic_sense)); | 585 | memcpy(scmd->cmnd, generic_sense, sizeof(generic_sense)); |
586 | 586 | ||
587 | scsi_result = kmalloc(252, GFP_ATOMIC | (scmd->device->host->hostt->unchecked_isa_dma) ? __GFP_DMA : 0); | 587 | scsi_result = kmalloc(252, GFP_ATOMIC | ((scmd->device->host->hostt->unchecked_isa_dma) ? __GFP_DMA : 0)); |
588 | 588 | ||
589 | 589 | ||
590 | if (unlikely(!scsi_result)) { | 590 | if (unlikely(!scsi_result)) { |
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 287d197a7c17..cca772624ae7 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c | |||
@@ -801,7 +801,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget, | |||
801 | if (!sreq) | 801 | if (!sreq) |
802 | goto out_free_sdev; | 802 | goto out_free_sdev; |
803 | result = kmalloc(256, GFP_ATOMIC | | 803 | result = kmalloc(256, GFP_ATOMIC | |
804 | (shost->unchecked_isa_dma) ? __GFP_DMA : 0); | 804 | ((shost->unchecked_isa_dma) ? __GFP_DMA : 0)); |
805 | if (!result) | 805 | if (!result) |
806 | goto out_free_sreq; | 806 | goto out_free_sreq; |
807 | 807 | ||