From 5dc2bc3abeacc73a4498b7b07a807bbeef1608ef Mon Sep 17 00:00:00 2001 From: GOTO Masanori Date: Sun, 25 Jun 2006 01:58:56 -0700 Subject: [PATCH] --- yaml --- r: 31903 b: refs/heads/master c: 3e7196cf6070821ff8246b15dfd219ffa6409062 h: refs/heads/master i: 31901: cca41eec52f1cfbddc9fe8131ef70ab2a9d1b189 31899: fa93c11d4edd5f3dfc244de6d540171c39ae549a 31895: c5246db7ef5b7cd844d6abd85a783f9e1187be2d 31887: e42f816ffb4b134e73d50f655c4d233355895699 31871: 2ab77a84aa945398431ca480ab2dfe8fef9c48c8 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/nsp32.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f2a046eaebd8..99d2ef9c406f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 041976fb6ae851cd18d96584a5d6361b564c9974 +refs/heads/master: 3e7196cf6070821ff8246b15dfd219ffa6409062 diff --git a/trunk/drivers/scsi/nsp32.c b/trunk/drivers/scsi/nsp32.c index 5c55e152e718..159fd5d8f98d 100644 --- a/trunk/drivers/scsi/nsp32.c +++ b/trunk/drivers/scsi/nsp32.c @@ -2886,12 +2886,19 @@ static int nsp32_detect(struct scsi_host_template *sht) } #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73)) - scsi_add_host (host, &PCIDEV->dev); + ret = scsi_add_host(host, &PCIDEV->dev); + if (ret) { + nsp32_msg(KERN_ERR, "failed to add scsi host"); + goto free_region; + } scsi_scan_host(host); #endif pci_set_drvdata(PCIDEV, host); return DETECT_OK; + free_region: + release_region(host->io_port, host->n_io_port); + free_irq: free_irq(host->irq, data);