diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2016-01-03 16:05:21 +1100 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-01-06 21:42:56 -0500 |
| commit | 0ad0eff98fec3c940ec199047ff580abaaa5bb1a (patch) | |
| tree | edbaaf6760250383f1bf45fe39e48a1422985126 /drivers/scsi/dtc.c | |
| parent | e52bbd5ccf53d2a73e524adb26b6d8a4f810ccb4 (diff) | |
ncr5380: Introduce unbound workqueue
Allocate a work queue that will permit busy waiting and sleeping. This
means NCR5380_init() can potentially fail, so add this error path.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Tested-by: Ondrej Zary <linux@rainbow-software.org>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/dtc.c')
| -rw-r--r-- | drivers/scsi/dtc.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c index 698bea067af9..bc856c8ba0dd 100644 --- a/drivers/scsi/dtc.c +++ b/drivers/scsi/dtc.c @@ -230,12 +230,13 @@ static int __init dtc_detect(struct scsi_host_template * tpnt) found: instance = scsi_register(tpnt, sizeof(struct NCR5380_hostdata)); if (instance == NULL) - break; + goto out_unmap; instance->base = addr; ((struct NCR5380_hostdata *)(instance)->hostdata)->base = base; - NCR5380_init(instance, 0); + if (NCR5380_init(instance, 0)) + goto out_unregister; NCR5380_maybe_reset_bus(instance); @@ -275,6 +276,12 @@ found: ++count; } return count; + +out_unregister: + scsi_unregister(instance); +out_unmap: + iounmap(base); + return count; } /* |