tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds e7c0d3da 682a2512

+1 -2
+1 -1
drivers/gpu/drm/drm_sysfs.c
··· 516 516 minor_str = "card%d"; 517 517 518 518 minor->kdev = kzalloc(sizeof(*minor->kdev), GFP_KERNEL); 519 - if (!minor->dev) { 519 + if (!minor->kdev) { 520 520 r = -ENOMEM; 521 521 goto error; 522 522 }
-1
drivers/gpu/drm/nouveau/nouveau_hwmon.c
··· 630 630 hwmon->hwmon = NULL; 631 631 return ret; 632 632 #else 633 - hwmon->hwmon = NULL; 634 633 return 0; 635 634 #endif 636 635 }