Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 13:15:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm: fix error returns, sysfs error handling

Browse Source 
- 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: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
This commit is contained in:
Jeff Garzik 2006-10-10 14:23:37 -07:00 committed by Dave Airlie
parent 0d960d26c4
commit 24f73c92a9
1 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/char/drm/drm_sysfs.c
View File

@ -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 *drm_sysfs_create(struct module *owner, char *name)
{ {
struct class *class; struct class *class;
int err;
class = class_create(owner, name); class = class_create(owner, name);
if (!class) if (!class) {
return 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; 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 *drm_sysfs_device_add(struct class *cs, drm_head_t *head)
{ {
struct class_device *class_dev; struct class_device *class_dev;
int i; int i, j, err;
class_dev = class_device_create(cs, NULL, class_dev = class_device_create(cs, NULL,
MKDEV(DRM_MAJOR, head->minor), MKDEV(DRM_MAJOR, head->minor),
&(head->dev->pdev)->dev, &(head->dev->pdev)->dev,
"card%d", head->minor); "card%d", head->minor);
if (!class_dev) if (!class_dev) {
return NULL; err = -ENOMEM;
goto err_out;
}
class_set_devdata(class_dev, head); class_set_devdata(class_dev, head);
for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++) for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++) {
class_device_create_file(class_dev, &class_device_attrs[i]); err = class_device_create_file(class_dev,
&class_device_attrs[i]);
if (err)
goto err_out_files;
}
return class_dev; 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);
} }
/** /**