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
This commit is contained in:
commit
e7c0d3dac8
|
@ -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 @@ error:
|
||||||
hwmon->hwmon = NULL;
|
hwmon->hwmon = NULL;
|
||||||
return ret;
|
return ret;
|
||||||
#else
|
#else
|
||||||
hwmon->hwmon = NULL;
|
|
||||||
return 0;
|
return 0;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue