[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>

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;