Created
November 21, 2013 10:22
-
-
Save dvdhrm/7579269 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c | |
| index 1a35ea5..cb951b2 100644 | |
| --- a/drivers/gpu/drm/drm_sysfs.c | |
| +++ b/drivers/gpu/drm/drm_sysfs.c | |
| @@ -489,6 +489,11 @@ void drm_sysfs_hotplug_event(struct drm_device *dev) | |
| } | |
| EXPORT_SYMBOL(drm_sysfs_hotplug_event); | |
| +static void drm_sysfs_release(struct device *dev) | |
| +{ | |
| + kfree(dev); | |
| +} | |
| + | |
| /** | |
| * drm_sysfs_device_add - adds a class device to sysfs for a character driver | |
| * @dev: DRM device to be added | |
| @@ -501,6 +506,7 @@ EXPORT_SYMBOL(drm_sysfs_hotplug_event); | |
| int drm_sysfs_device_add(struct drm_minor *minor) | |
| { | |
| char *minor_str; | |
| + int r; | |
| if (minor->type == DRM_MINOR_CONTROL) | |
| minor_str = "controlD%d"; | |
| @@ -509,14 +515,35 @@ int drm_sysfs_device_add(struct drm_minor *minor) | |
| else | |
| minor_str = "card%d"; | |
| - minor->kdev = device_create(drm_class, minor->dev->dev, | |
| - MKDEV(DRM_MAJOR, minor->index), | |
| - minor, minor_str, minor->index); | |
| - if (IS_ERR(minor->kdev)) { | |
| - DRM_ERROR("device create failed %ld\n", PTR_ERR(minor->kdev)); | |
| - return PTR_ERR(minor->kdev); | |
| + minor->kdev = kzalloc(sizeof(*minor->kdev), GFP_KERNEL); | |
| + if (!minor->dev) { | |
| + r = -ENOMEM; | |
| + goto error; | |
| } | |
| + | |
| + device_initialize(minor->kdev); | |
| + minor->kdev->devt = MKDEV(DRM_MAJOR, minor->index); | |
| + minor->kdev->class = drm_class; | |
| + minor->kdev->type = &drm_sysfs_device_minor; | |
| + minor->kdev->parent = minor->dev->dev; | |
| + minor->kdev->groups = NULL; | |
| + minor->kdev->release = drm_sysfs_release; | |
| + dev_set_drvdata(minor->kdev, minor); | |
| + | |
| + r = dev_set_name(minor->kdev, minor_str, minor->index); | |
| + if (r < 0) | |
| + goto error; | |
| + | |
| + r = device_add(minor->kdev); | |
| + if (r < 0) | |
| + goto error; | |
| + | |
| return 0; | |
| + | |
| +error: | |
| + DRM_ERROR("device create failed %ld\n", PTR_ERR(minor->kdev)); | |
| + put_device(minor->kdev); | |
| + return r; | |
| } | |
| /** |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment