luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds 2013-11-27 21:06:55 -08:00
commit e7c0d3dac8
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/drm_sysfs.c
View File

@ -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;
}

1
drivers/gpu/drm/nouveau/nouveau_hwmon.c
View File

@ -630,7 +630,6 @@ nouveau_hwmon_init(struct drm_device *dev)
hwmon->hwmon = NULL;
return ret;
#else
hwmon->hwmon = NULL;
return 0;
#endif
}