lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge by hand - fix up rejections in Documentation/DocBook/Makefile

Browse Source
This commit is contained in:
James Bottomley
2005-05-20 15:27:44 -05:00
parent 90356ac319 88d7bd8cb9
commit ad34ea2cc3
1282 changed files with 32304 additions and 15748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/scsi_error.c
View File

@@ -582,7 +582,7 @@ static int scsi_request_sense(struct scsi_cmnd *scmd)
memcpy(scmd->cmnd, generic_sense, sizeof(generic_sense));
scsi_result = kmalloc(252, GFP_ATOMIC | (scmd->device->host->hostt->unchecked_isa_dma) ? __GFP_DMA : 0);
scsi_result = kmalloc(252, GFP_ATOMIC | ((scmd->device->host->hostt->unchecked_isa_dma) ? __GFP_DMA : 0));
if (unlikely(!scsi_result)) {