summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorLucas Stach2011-01-30 10:54:11 +0100
committerBen Skeggs2011-02-02 01:17:16 +0100
commit8c06a3e02062a9beb71a9444c49fb0fbcaa1eed3 (patch)
tree18eb6ca1cc1fbd76903385e875f118121931ed59 /drivers/gpu
parentdrm/nv50: fix regression on IGPs (diff)
downloadkernel-qcow2-linux-8c06a3e02062a9beb71a9444c49fb0fbcaa1eed3.tar.gz
kernel-qcow2-linux-8c06a3e02062a9beb71a9444c49fb0fbcaa1eed3.tar.xz
kernel-qcow2-linux-8c06a3e02062a9beb71a9444c49fb0fbcaa1eed3.zip
drm/nouveau: correctly pair hwmon_init and hwmon_fini
I broke this with my commit 07cfe0e7a820ecad078c04e9c2a102521709145d This fixes fdo #33434 Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index fb846a3fef15..f05c0cddfeca 100644
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
@@ -443,7 +443,7 @@ nouveau_hwmon_fini(struct drm_device *dev)
struct nouveau_pm_engine *pm = &dev_priv->engine.pm;
if (pm->hwmon) {
- sysfs_remove_group(&pm->hwmon->kobj, &hwmon_attrgroup);
+ sysfs_remove_group(&dev->pdev->dev.kobj, &hwmon_attrgroup);
hwmon_device_unregister(pm->hwmon);
}
#endif