diff options
Diffstat (limited to 'drivers/scsi/megaraid.c')
| -rw-r--r-- | drivers/scsi/megaraid.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index 7ceb5cf12c6b..9aa048525eb2 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c | |||
| @@ -366,7 +366,7 @@ mega_runpendq(adapter_t *adapter) | |||
| 366 | * The command queuing entry point for the mid-layer. | 366 | * The command queuing entry point for the mid-layer. |
| 367 | */ | 367 | */ |
| 368 | static int | 368 | static int |
| 369 | megaraid_queue(Scsi_Cmnd *scmd, void (*done)(Scsi_Cmnd *)) | 369 | megaraid_queue_lck(Scsi_Cmnd *scmd, void (*done)(Scsi_Cmnd *)) |
| 370 | { | 370 | { |
| 371 | adapter_t *adapter; | 371 | adapter_t *adapter; |
| 372 | scb_t *scb; | 372 | scb_t *scb; |
| @@ -409,6 +409,8 @@ megaraid_queue(Scsi_Cmnd *scmd, void (*done)(Scsi_Cmnd *)) | |||
| 409 | return busy; | 409 | return busy; |
| 410 | } | 410 | } |
| 411 | 411 | ||
| 412 | static DEF_SCSI_QCMD(megaraid_queue) | ||
| 413 | |||
| 412 | /** | 414 | /** |
| 413 | * mega_allocate_scb() | 415 | * mega_allocate_scb() |
| 414 | * @adapter - pointer to our soft state | 416 | * @adapter - pointer to our soft state |
| @@ -4456,7 +4458,7 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru) | |||
| 4456 | 4458 | ||
| 4457 | scb->idx = CMDID_INT_CMDS; | 4459 | scb->idx = CMDID_INT_CMDS; |
| 4458 | 4460 | ||
| 4459 | megaraid_queue(scmd, mega_internal_done); | 4461 | megaraid_queue_lck(scmd, mega_internal_done); |
| 4460 | 4462 | ||
| 4461 | wait_for_completion(&adapter->int_waitq); | 4463 | wait_for_completion(&adapter->int_waitq); |
| 4462 | 4464 | ||
