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

Commit 24f73c92 authored by Jeff Garzik's avatar Jeff Garzik Committed by Dave Airlie
Browse files

drm: fix error returns, sysfs error handling 



- callers of drm_sysfs_create() and drm_sysfs_device_add() looked for
  errors using IS_ERR(), but the functions themselves only ever returned
  NULL on error.  Fixed.

- unwind from, and propagate sysfs errors

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 0d960d26

drivers/char/drm/drm_sysfs.c

+35 −8
Original line number Diff line number Diff line
@@ -42,13 +42,24 @@ static CLASS_ATTR(version, S_IRUGO, version_show, NULL); 
struct class *drm_sysfs_create(struct module *owner, char *name)

{

	struct class *class;

	int err;



	class = class_create(owner, name);

	if (!class)

		return class;

	if (!class) {

		err = -ENOMEM;

		goto err_out;

	}



	err = class_create_file(class, &class_attr_version);

	if (err)

		goto err_out_class;



	class_create_file(class, &class_attr_version);

	return class;



err_out_class:

	class_destroy(class);

err_out:

	return ERR_PTR(err);

}



/**
@@ -96,20 +107,36 @@ static struct class_device_attribute class_device_attrs[] = { 
struct class_device *drm_sysfs_device_add(struct class *cs, drm_head_t *head)

{

	struct class_device *class_dev;

	int i;

	int i, j, err;



	class_dev = class_device_create(cs, NULL,

					MKDEV(DRM_MAJOR, head->minor),

					&(head->dev->pdev)->dev,

					"card%d", head->minor);

	if (!class_dev)

		return NULL;

	if (!class_dev) {

		err = -ENOMEM;

		goto err_out;

	}



	class_set_devdata(class_dev, head);



	for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)

		class_device_create_file(class_dev, &class_device_attrs[i]);

	for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++) {

		err = class_device_create_file(class_dev,

					       &class_device_attrs[i]);

		if (err)

			goto err_out_files;

	}



	return class_dev;



err_out_files:

	if (i > 0)

		for (j = 0; j < i; j++)

			class_device_remove_file(class_dev,

						 &class_device_attrs[i]);

	class_device_unregister(class_dev);

err_out:

	return ERR_PTR(err);

}



/**