diff options
| author |   Al Viro <viro@www.linux.org.uk> | 2005-04-24 12:28:34 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-24 12:28:34 -0700 |
| commit | bc86120a85ebf553180946e8854d1993f074e9f5 (patch) | |
| tree | d2d84a28a50328d8d910176b4031482ee308bc55 /drivers/scsi/scsi_scan.c | |
| parent | [IA64] Fix build errors for !HOTPLUG case. (diff) | |
| download | linux-dev-bc86120a85ebf553180946e8854d1993f074e9f5.tar.xz linux-dev-bc86120a85ebf553180946e8854d1993f074e9f5.zip | |
[PATCH] SCSI GFP fixes
Somebody forgot that | has higher priority than ?:. As the result,
allocation is done with bogus flags - instead of GFP_ATOMIC + possibly
GFP_DMA we always get GFP_DMA and no GFP_ATOMIC.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, if (!sreq) goto out_free_sdev; result = kmalloc(256, GFP_ATOMIC | - (shost->unchecked_isa_dma) ? __GFP_DMA : 0); + ((shost->unchecked_isa_dma) ? __GFP_DMA : 0)); if (!result) goto out_free_sreq; |