Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7c0d3da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

drivers/gpu/drm/drm_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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

+0 −1
Original line number Diff line number Diff line
@@ -630,7 +630,6 @@ nouveau_hwmon_init(struct drm_device *dev) 
	hwmon->hwmon = NULL;

	return ret;

#else

	hwmon->hwmon = NULL;

	return 0;

#endif

}