diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /drivers/scsi/hosts.c | |
parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/scsi/hosts.c')
-rw-r--r-- | drivers/scsi/hosts.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index dfcb96f3e60c..68ef1636678d 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c | |||
@@ -265,6 +265,9 @@ static void scsi_host_dev_release(struct device *dev) | |||
265 | destroy_workqueue(shost->work_q); | 265 | destroy_workqueue(shost->work_q); |
266 | 266 | ||
267 | scsi_destroy_command_freelist(shost); | 267 | scsi_destroy_command_freelist(shost); |
268 | if (shost->bqt) | ||
269 | blk_free_tags(shost->bqt); | ||
270 | |||
268 | kfree(shost->shost_data); | 271 | kfree(shost->shost_data); |
269 | 272 | ||
270 | if (parent) | 273 | if (parent) |
@@ -487,7 +490,9 @@ EXPORT_SYMBOL(scsi_is_host_device); | |||
487 | * @work: Work to queue for execution. | 490 | * @work: Work to queue for execution. |
488 | * | 491 | * |
489 | * Return value: | 492 | * Return value: |
490 | * 0 on success / != 0 for error | 493 | * 1 - work queued for execution |
494 | * 0 - work is already queued | ||
495 | * -EINVAL - work queue doesn't exist | ||
491 | **/ | 496 | **/ |
492 | int scsi_queue_work(struct Scsi_Host *shost, struct work_struct *work) | 497 | int scsi_queue_work(struct Scsi_Host *shost, struct work_struct *work) |
493 | { | 498 | { |