Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6826ee4f authored by James Bottomley's avatar James Bottomley Committed by James Bottomley
Browse files

[SCSI] bsg: fix bsg_register_queue error path 



unfortunately, if IS_ERR(class_dev) is true, that means class_dev isn't
null and the check in the error leg is pointless ... it's also asking
for trouble to request unregistration of a device we haven't actually
created (although it works currently).  Fix by using explicit gotos and
unregisters.

Acked-by: default avatarFUJITA Tomonori <tomof@acm.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent d73f5222

block/bsg.c

+4 −3
Original line number Diff line number Diff line
@@ -993,7 +993,7 @@ int bsg_register_queue(struct request_queue *q, const char *name) 
	if (q->kobj.sd) {

		ret = sysfs_create_link(&q->kobj, &bcd->class_dev->kobj, "bsg");

		if (ret)

			goto err;

			goto err_unregister;

	}



	list_add_tail(&bcd->list, &bsg_class_list);
@@ -1001,9 +1001,10 @@ int bsg_register_queue(struct request_queue *q, const char *name) 


	mutex_unlock(&bsg_mutex);

	return 0;



err_unregister:

	class_device_unregister(class_dev);

err:

	if (class_dev)

		class_device_destroy(bsg_class, MKDEV(bsg_major, bcd->minor));

	mutex_unlock(&bsg_mutex);

	return ret;

}