From 9bf4d8878d2c119d147e498817d5f1037a83ddde Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 22 Nov 2008 17:34:54 +0000 Subject: [PATCH] --- yaml --- r: 119307 b: refs/heads/master c: 30037818f7c1e11cb3742fbecd614ef3dc7b27bb h: refs/heads/master i: 119305: 72283111a1ac8cc8a7ce6778fc347323c94d6e83 119303: 621f7a75e31fb78c0bbbff2802b2f2a2ad5bcbec v: v3 --- [refs] | 2 +- trunk/drivers/scsi/advansys.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 36e78701863c..5984bf3c3285 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fceab0bd8d82509519e9b842a5a7234b2397fb4 +refs/heads/master: 30037818f7c1e11cb3742fbecd614ef3dc7b27bb diff --git a/trunk/drivers/scsi/advansys.c b/trunk/drivers/scsi/advansys.c index 218777bfc143..399fe559e4de 100644 --- a/trunk/drivers/scsi/advansys.c +++ b/trunk/drivers/scsi/advansys.c @@ -13872,8 +13872,10 @@ static int __devinit advansys_board_found(struct Scsi_Host *shost, advansys_wide_free_mem(boardp); free_irq(boardp->irq, shost); err_free_dma: +#ifdef CONFIG_ISA if (shost->dma_channel != NO_ISA_DMA) free_dma(shost->dma_channel); +#endif err_free_proc: kfree(boardp->prtbuf); err_unmap: @@ -13894,10 +13896,12 @@ static int advansys_release(struct Scsi_Host *shost) ASC_DBG(1, "begin\n"); scsi_remove_host(shost); free_irq(board->irq, shost); +#ifdef CONFIG_ISA if (shost->dma_channel != NO_ISA_DMA) { ASC_DBG(1, "free_dma()\n"); free_dma(shost->dma_channel); } +#endif if (ASC_NARROW_BOARD(board)) { dma_unmap_single(board->dev, board->dvc_var.asc_dvc_var.overrun_dma,