drm/sysfs: Do not drop device reference twice

device_unregister() already drops its reference to the struct device, so
explicitly calling put_device() before device_unregister() can cause the
device to have been freed before it can be unregistered.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Tested-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Tested-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index dae42c79154f3de596a06c95d1e996750fe6e35c..db1c8f958babb1579b5f18dc5415154b22e72f7e 100644 (file)
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -439,7 +439,6 @@ err_out_files:
                device_remove_file(connector->kdev, &connector_attrs_opt1[i]);
        for (i = 0; i < attr_cnt; i++)
                device_remove_file(connector->kdev, &connector_attrs[i]);
-       put_device(connector->kdev);
        device_unregister(connector->kdev);
 
 out:
@@ -472,7 +471,6 @@ void drm_sysfs_connector_remove(struct drm_connector *connector)
        for (i = 0; i < ARRAY_SIZE(connector_attrs); i++)
                device_remove_file(connector->kdev, &connector_attrs[i]);
        sysfs_remove_bin_file(&connector->kdev->kobj, &edid_attr);
-       put_device(connector->kdev);
        device_unregister(connector->kdev);
        connector->kdev = NULL;
 }