aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/cciss_scsi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block/cciss_scsi.c')
-rw-r--r--drivers/block/cciss_scsi.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index 9133ad4c7b1b..9fe0d8ffc90d 100644
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
@@ -49,8 +49,10 @@ static int fill_cmd(ctlr_info_t *h, CommandList_struct *c, __u8 cmd, void *buff,
49 __u8 page_code, unsigned char *scsi3addr, 49 __u8 page_code, unsigned char *scsi3addr,
50 int cmd_type); 50 int cmd_type);
51 51
52static CommandList_struct *cmd_alloc(ctlr_info_t *h, int get_from_pool); 52static CommandList_struct *cmd_alloc(ctlr_info_t *h);
53static void cmd_free(ctlr_info_t *h, CommandList_struct *c, int got_from_pool); 53static CommandList_struct *cmd_special_alloc(ctlr_info_t *h);
54static void cmd_free(ctlr_info_t *h, CommandList_struct *c);
55static void cmd_special_free(ctlr_info_t *h, CommandList_struct *c);
54 56
55static int cciss_scsi_proc_info( 57static int cciss_scsi_proc_info(
56 struct Scsi_Host *sh, 58 struct Scsi_Host *sh,
@@ -1582,7 +1584,7 @@ static int wait_for_device_to_become_ready(ctlr_info_t *h,
1582 int waittime = HZ; 1584 int waittime = HZ;
1583 CommandList_struct *c; 1585 CommandList_struct *c;
1584 1586
1585 c = cmd_alloc(h, 1); 1587 c = cmd_alloc(h);
1586 if (!c) { 1588 if (!c) {
1587 printk(KERN_WARNING "cciss%d: out of memory in " 1589 printk(KERN_WARNING "cciss%d: out of memory in "
1588 "wait_for_device_to_become_ready.\n", h->ctlr); 1590 "wait_for_device_to_become_ready.\n", h->ctlr);
@@ -1640,7 +1642,7 @@ retry_tur:
1640 else 1642 else
1641 printk(KERN_WARNING "cciss%d: device is ready.\n", h->ctlr); 1643 printk(KERN_WARNING "cciss%d: device is ready.\n", h->ctlr);
1642 1644
1643 cmd_free(h, c, 1); 1645 cmd_free(h, c);
1644 return rc; 1646 return rc;
1645} 1647}
1646 1648