diff options
| author | Oliver Schinagl <oliver@schinagl.nl> | 2011-03-15 12:33:20 (GMT) |
|---|---|---|
| committer | Oliver Schinagl <oliver@schinagl.nl> | 2011-03-15 12:33:20 (GMT) |
| commit | d66024a03c43952bc230fa9d0133f545d9caab00 (patch) | |
| tree | f9994677e8f7ab051d014ce97c695a163cb6af45 /uClinux-2.4.20-uc1/drivers/scsi/BusLogic.c | |
| parent | 6dcf0627548ed55ae7819bf1bab446ee87ffc8bc (diff) | |
| download | openipcam-d66024a03c43952bc230fa9d0133f545d9caab00.zip openipcam-d66024a03c43952bc230fa9d0133f545d9caab00.tar.gz openipcam-d66024a03c43952bc230fa9d0133f545d9caab00.tar.bz2 | |
W90N745 scsi changes
Diffstat (limited to 'uClinux-2.4.20-uc1/drivers/scsi/BusLogic.c')
| -rw-r--r-- | uClinux-2.4.20-uc1/drivers/scsi/BusLogic.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/uClinux-2.4.20-uc1/drivers/scsi/BusLogic.c b/uClinux-2.4.20-uc1/drivers/scsi/BusLogic.c index 85d61ad..0793a32 100644 --- a/uClinux-2.4.20-uc1/drivers/scsi/BusLogic.c +++ b/uClinux-2.4.20-uc1/drivers/scsi/BusLogic.c @@ -257,10 +257,17 @@ static boolean BusLogic_CreateInitialCCBs(BusLogic_HostAdapter_T *HostAdapter) int BlockSize = BusLogic_CCB_AllocationGroupSize * sizeof(BusLogic_CCB_T); while (HostAdapter->AllocatedCCBs < HostAdapter->InitialCCBs) { +#ifndef CONFIG_BOARD_W90N745 void *BlockPointer = kmalloc(BlockSize, (HostAdapter->BounceBuffersRequired ? GFP_ATOMIC | GFP_DMA : GFP_ATOMIC)); +#else + void *BlockPointer = kmalloc(BlockSize, + (HostAdapter->BounceBuffersRequired + ? GFP_ATOMIC + : GFP_ATOMIC)); +#endif if (BlockPointer == NULL) { BusLogic_Error("UNABLE TO ALLOCATE CCB GROUP - DETACHING\n", @@ -307,10 +314,17 @@ static void BusLogic_CreateAdditionalCCBs(BusLogic_HostAdapter_T *HostAdapter, if (AdditionalCCBs <= 0) return; while (HostAdapter->AllocatedCCBs - PreviouslyAllocated < AdditionalCCBs) { +#ifndef CONFIG_BOARD_W90N745 void *BlockPointer = kmalloc(BlockSize, (HostAdapter->BounceBuffersRequired ? GFP_ATOMIC | GFP_DMA : GFP_ATOMIC)); +#else + void *BlockPointer = kmalloc(BlockSize, + (HostAdapter->BounceBuffersRequired + ? GFP_ATOMIC + : GFP_ATOMIC)); +#endif if (BlockPointer == NULL) break; BusLogic_InitializeCCBs(HostAdapter, BlockPointer, BlockSize); } |