From 35b154834b0244990bb032fbc1c5ee536a6fa4ae Mon Sep 17 00:00:00 2001 From: Mike Christie Date: Wed, 11 Jun 2008 19:21:00 -0500 Subject: [PATCH] --- yaml --- r: 98257 b: refs/heads/master c: 3ed7897242b7efe977f3a8d06d4e5a4ebe28b10e h: refs/heads/master i: 98255: 657072304e4be58c96385f614fb8c5988b7f4768 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/hosts.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4450affe84ad..cb02d953df5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1daeabf0da5bfa1943272ce508e2ba785730bf0 +refs/heads/master: 3ed7897242b7efe977f3a8d06d4e5a4ebe28b10e diff --git a/trunk/drivers/scsi/hosts.c b/trunk/drivers/scsi/hosts.c index 3690360d7a79..c6457bfc8a49 100644 --- a/trunk/drivers/scsi/hosts.c +++ b/trunk/drivers/scsi/hosts.c @@ -456,6 +456,10 @@ static int __scsi_host_match(struct device *dev, void *data) * * Return value: * A pointer to located Scsi_Host or NULL. + * + * The caller must do a scsi_host_put() to drop the reference + * that scsi_host_get() took. The put_device() below dropped + * the reference from class_find_device(). **/ struct Scsi_Host *scsi_host_lookup(unsigned short hostnum) { @@ -463,9 +467,10 @@ struct Scsi_Host *scsi_host_lookup(unsigned short hostnum) struct Scsi_Host *shost = ERR_PTR(-ENXIO); cdev = class_find_device(&shost_class, &hostnum, __scsi_host_match); - if (cdev) + if (cdev) { shost = scsi_host_get(class_to_shost(cdev)); - + put_device(cdev); + } return shost; } EXPORT_SYMBOL(scsi_host_lookup);