ARC: ioremap: use more commonly used PAGE_KERNEL based uncached flag

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

diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index a82b63a..95d7a35 100644 (file)
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -376,15 +376,11 @@ static int falcon_get_lock(struct Scsi_Host *instance)
        if (IS_A_TT())
                return 1;
 
-       if (stdma_is_locked_by(scsi_falcon_intr) &&
-           instance->hostt->can_queue > 1)
+       if (stdma_is_locked_by(scsi_falcon_intr))
                return 1;
 
-       if (in_interrupt())
-               return stdma_try_lock(scsi_falcon_intr, instance);
-
-       stdma_lock(scsi_falcon_intr, instance);
-       return 1;
+       /* stdma_lock() may sleep which means it can't be used here */
+       return stdma_try_lock(scsi_falcon_intr, instance);
 }
 
 #ifndef MODULE