diff options
| author | davem <davem> | 2001-12-11 10:03:11 +0000 |
|---|---|---|
| committer | davem <davem> | 2001-12-11 10:03:11 +0000 |
| commit | a774639a8ed1012610933c9bf8ad89aeb5c79c7e (patch) | |
| tree | 2cd47c4a268e36122fa7caf1913c7849ed441418 | |
| parent | 0ace940bd7a90ca3613c2be1750c13866aac507a (diff) | |
| download | netdev-vger-cvs-a774639a8ed1012610933c9bf8ad89aeb5c79c7e.tar.gz | |
Resolve merge errors.
| -rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_hipd.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c index ce06b7222..3ed0e9e53 100644 --- a/drivers/scsi/sym53c8xx_2/sym_hipd.c +++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c @@ -4689,8 +4689,9 @@ out_reject: return; out_clrack: OUTL_DSP (SCRIPTA_BA (np, clrack)); + return; out_stuck: - ; + return; } /* @@ -5223,8 +5224,10 @@ static void sym_alloc_lcb_tags (hcb_p np, u_char tn, u_char ln) * And accept tagged commands now. */ lp->head.itlq_tbl_sa = cpu_to_scr(vtobus(lp->itlq_tbl)); + + return; fail: - ; + return; } /* @@ -5787,6 +5790,13 @@ int sym_hcb_attach(hcb_p np, struct sym_fw *fw) goto attach_failed; /* + * Allocate the array of lists of CCBs hashed by DSA. + */ + np->ccbh = sym_calloc(sizeof(ccb_p *)*CCB_HASH_SIZE, "CCBH"); + if (!np->ccbh) + goto attach_failed; + + /* * Initialyze the CCB free and busy queues. */ sym_que_init(&np->free_ccbq); @@ -5977,6 +5987,8 @@ void sym_hcb_free(hcb_p np) sym_mfree_dma(cp, sizeof(*cp), "CCB"); } } + if (np->ccbh) + sym_mfree(np->ccbh, sizeof(ccb_p *)*CCB_HASH_SIZE, "CCBH"); if (np->badluntbl) sym_mfree_dma(np->badluntbl, 256,"BADLUNTBL"); |