Merge tag 'v5.1-rc1' into spi-5.2

[linux-2.6-microblaze.git] / drivers / scsi / scsi_scan.c

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index dd0d516..53380e0 100644 (file)
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -220,7 +220,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;
 
@@ -788,7 +788,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;
 
@@ -1079,7 +1079,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;