From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vasiliy Kulikov Date: Sun, 19 Sep 2010 12:55:07 +0000 Subject: [PATCH 10/14] scsi: osd: fix device_register() error handling Message-Id: <1284900907-24621-1-git-send-email-segooon@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kernel-janitors@vger.kernel.org Cc: Boaz Harrosh , Benny Halevy , "James E.J. Bottomley" , Tejun Heo , Arnd Bergmann , osd-dev@open-osd.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org If device_register() fails then call put_device(). See comment to device_register. Signed-off-by: Vasiliy Kulikov --- compile tested. drivers/scsi/osd/osd_uld.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c index cefb2c0..3e0edc2 100644 --- a/drivers/scsi/osd/osd_uld.c +++ b/drivers/scsi/osd/osd_uld.c @@ -474,7 +474,7 @@ static int osd_probe(struct device *dev) error = device_register(&oud->class_dev); if (error) { OSD_ERR("device_register failed => %d\n", error); - goto err_put_cdev; + goto err_put_device; } get_device(&oud->class_dev); @@ -482,6 +482,8 @@ static int osd_probe(struct device *dev) OSD_INFO("osd_probe %s\n", disk->disk_name); return 0; +err_put_device: + put_device(&oud->class_dev); err_put_cdev: cdev_del(&oud->cdev); err_put_disk: -- 1.7.0.4