Commit e7c0d3da authored by Linus Torvalds's avatar Linus Torvalds

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

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
parents 682a2512 eec99016
...@@ -516,7 +516,7 @@ int drm_sysfs_device_add(struct drm_minor *minor) ...@@ -516,7 +516,7 @@ int drm_sysfs_device_add(struct drm_minor *minor)
minor_str = "card%d"; minor_str = "card%d";
minor->kdev = kzalloc(sizeof(*minor->kdev), GFP_KERNEL); minor->kdev = kzalloc(sizeof(*minor->kdev), GFP_KERNEL);
if (!minor->dev) { if (!minor->kdev) {
r = -ENOMEM; r = -ENOMEM;
goto error; goto error;
} }
......
...@@ -630,7 +630,6 @@ nouveau_hwmon_init(struct drm_device *dev) ...@@ -630,7 +630,6 @@ nouveau_hwmon_init(struct drm_device *dev)
hwmon->hwmon = NULL; hwmon->hwmon = NULL;
return ret; return ret;
#else #else
hwmon->hwmon = NULL;
return 0; return 0;
#endif #endif
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment