diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-17 21:19:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-17 21:19:50 -0700 |
| commit | 78af08d90b8f745044b1274430bc4bc6b2b27aca (patch) | |
| tree | 9e233eb5acf9974bf02de57a9d88c35f86629114 /drivers/gpu/drm/drm_debugfs.c | |
| parent | a1cc1ba7aec1ba41317d227b1fe8d0f8c0cec232 (diff) | |
| parent | ecca0683230b83e8f830ff157911fad20bc43015 (diff) | |
| download | linux-78af08d90b8f745044b1274430bc4bc6b2b27aca.tar.gz linux-78af08d90b8f745044b1274430bc4bc6b2b27aca.tar.bz2 linux-78af08d90b8f745044b1274430bc4bc6b2b27aca.zip | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: Move a dereference below a NULL test
fb/intelfb: conflict with DRM_I915 and hide by default
drm/ttm: fix misplaced parentheses
drm/via: Fix vblank IRQ on VIA hardware.
drm: drm_gem, check kzalloc retval
drm: drm_debugfs, check kmalloc retval
drm/radeon: add some missing pci ids
Diffstat (limited to 'drivers/gpu/drm/drm_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/drm_debugfs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c index 2960b6d73456..9903f270e440 100644 --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c @@ -101,6 +101,10 @@ int drm_debugfs_create_files(struct drm_info_list *files, int count, continue; tmp = kmalloc(sizeof(struct drm_info_node), GFP_KERNEL); + if (tmp == NULL) { + ret = -1; + goto fail; + } ent = debugfs_create_file(files[i].name, S_IFREG | S_IRUGO, root, tmp, &drm_debugfs_fops); if (!ent) { |