Synchronize with Feral CVS repository:

- do not dereference a null pointer


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@259 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Stanislaw Gruszka
2008-02-12 09:11:30 +00:00
parent ac3090e2c9
commit 75428f7e2d
2 changed files with 10 additions and 3 deletions

View File

@@ -1,4 +1,4 @@
/* $Id: isp_pci.c,v 1.142 2007/11/14 18:19:36 mjacob Exp $ */
/* $Id: isp_pci.c,v 1.144 2007/11/27 17:58:04 mjacob Exp $ */
/*
* Copyright (c) 1997-2007 by Matthew Jacob
* All rights reserved.
@@ -3180,6 +3180,7 @@ isplinux_pci_remove(struct pci_dev *pdev)
struct isp_pcisoftc *pci_isp = pci_get_drvdata(pdev);
unsigned long flags;
ispsoftc_t *isp;
int i;
struct Scsi_Host *host;
isp = (ispsoftc_t *) pci_isp;
@@ -3218,6 +3219,12 @@ isplinux_pci_remove(struct pci_dev *pdev)
#endif
scsi_host_put(host);
pci_set_drvdata(pdev, NULL);
for (i = 0; i < MAX_ISP; i++) {
if (isplist[i] == isp) {
isplist[i] = NULL;
break;
}
}
}
static struct pci_driver isplinux_pci_driver = {

View File

@@ -1,4 +1,4 @@
/* $Id: scsi_target.c,v 1.73 2007/11/14 18:19:29 mjacob Exp $ */
/* $Id: scsi_target.c,v 1.74 2007/11/27 17:57:26 mjacob Exp $ */
/*
* Copyright (c) 1997-2007 by Matthew Jacob
* All rights reserved.
@@ -1928,7 +1928,7 @@ scsi_target_handler(qact_e action, void *arg)
}
}
if (tmd == NULL) {
printk(KERN_WARNING "scsi_target: ABORT_TASK[%llx] cannot find tmd\n", tmd->cd_tagval);
printk(KERN_WARNING "scsi_target: ABORT_TASK[%llx] cannot find tmd\n", np->nt_tagval);
}
}
spin_unlock_irqrestore(&scsi_target_lock, flags);