diff options
| author | Mark Brown <broonie@kernel.org> | 2019-04-19 12:38:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-19 12:38:47 +0100 |
| commit | e041af807709507cbdb01970e861725aaae682ee (patch) | |
| tree | a69e839dcff416c2fa9a81d937769da78c17b183 /drivers/scsi/scsi_scan.c | |
| parent | 95b78998253d09c0da966db625f102516bd9038e (diff) | |
| parent | df62169c33a1d06fbe8d0a411c250f230e64b44c (diff) | |
Merge tag 'v4.9.169' into linux-linaro-lsk-v4.9linux-linaro-lsk-v4.9
This is the 4.9.169 stable release
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 27a6d3c6cb7c..67f6f134abc4 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -219,7 +219,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget, struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); sdev = kzalloc(sizeof(*sdev) + shost->transportt->device_size, - GFP_ATOMIC); + GFP_KERNEL); if (!sdev) goto out; @@ -796,7 +796,7 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result, */ sdev->inquiry = kmemdup(inq_result, max_t(size_t, sdev->inquiry_len, 36), - GFP_ATOMIC); + GFP_KERNEL); if (sdev->inquiry == NULL) return SCSI_SCAN_NO_RESPONSE; @@ -1095,7 +1095,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget, if (!sdev) goto out; - result = kmalloc(result_len, GFP_ATOMIC | + result = kmalloc(result_len, GFP_KERNEL | ((shost->unchecked_isa_dma) ? __GFP_DMA : 0)); if (!result) goto out_free_sdev; |