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

Commit 25823226 authored by David Härdeman's avatar David Härdeman Committed by Mauro Carvalho Chehab
Browse files

[media] lirc_dev: clarify error handling 



out_sysfs is misleading, sysfs only comes into play after device_add().
Also, calling device_init() before the rest of struct dev is filled out
is clearer.

Signed-off-by: default avatarDavid Härdeman <david@hardeman.nu>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent c3104e1b

drivers/media/rc/lirc_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -238,16 +238,16 @@ static int lirc_allocate_driver(struct lirc_driver *d) 


	ir->d = *d;



	device_initialize(&ir->dev);

	ir->dev.devt = MKDEV(MAJOR(lirc_base_dev), ir->d.minor);

	ir->dev.class = lirc_class;

	ir->dev.parent = d->dev;

	ir->dev.release = lirc_release;

	dev_set_name(&ir->dev, "lirc%d", ir->d.minor);

	device_initialize(&ir->dev);



	err = lirc_cdev_add(ir);

	if (err)

		goto out_sysfs;

		goto out_free_dev;



	ir->attached = 1;
@@ -264,7 +264,7 @@ static int lirc_allocate_driver(struct lirc_driver *d) 
	return minor;

out_cdev:

	cdev_del(&ir->cdev);

out_sysfs:

out_free_dev:

	put_device(&ir->dev);

out_lock:

	mutex_unlock(&lirc_dev_lock);