Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

e7c0d3da · Linus Torvalds <[email protected]> · 2013-11-27 21:06:55 -08:00

Pull drm fixes from Dave Airlie:
 "Just two minor fixes as people keep resending since they are so low
  hanging"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau/hwmon: fix compilation without CONFIG_HWMON
  drm/sysfs: fix OOM verification

Commit: e7c0d3dac88bc38c4ccd64261d572f67eff056fd
Parents: 682a2512 · eec99016

Merge commit. Changes below are compared with the first parent: 682a2512.

Changes

2 files changed · +1 −2

File	Status	Add	Del	Content
drivers/gpu/drm/drm_sysfs.c	modified	+1	−1	View file
drivers/gpu/drm/nouveau/nouveau_hwmon.c	modified	+0	−1	View file

drivers/gpu/drm/drm_sysfs.c

View file

diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index bd2bca3..c22c309 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -516,7 +516,7 @@ int drm_sysfs_device_add(struct drm_minor *minor)
                 minor_str = "card%d";
 
 	minor->kdev = kzalloc(sizeof(*minor->kdev), GFP_KERNEL);
-	if (!minor->dev) {
+	if (!minor->kdev) {
 		r = -ENOMEM;
 		goto error;
 	}

drivers/gpu/drm/nouveau/nouveau_hwmon.c

View file

diff --git a/drivers/gpu/drm/nouveau/nouveau_hwmon.c b/drivers/gpu/drm/nouveau/nouveau_hwmon.c
index 38a4db5..4aff04f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_hwmon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_hwmon.c
@@ -630,7 +630,6 @@ error:
 	hwmon->hwmon = NULL;
 	return ret;
 #else
-	hwmon->hwmon = NULL;
 	return 0;
 #endif
 }