diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2011-07-23 13:09:03 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-07-23 13:09:03 -0400 |
| commit | 87045b033a62777337ae4aa62834876da09b5fb5 (patch) | |
| tree | 26aefd28e436668ff906e42b1e0d75c056e33e01 /drivers/gpu/drm/drm_crtc.c | |
| parent | 0d83ab65ff1b54ce8b6cd172285cf71a38c4cceb (diff) | |
| parent | bfe159a51203c15d23cb3158fffdc25ec4b4dda1 (diff) | |
Merge branch 'scsi-fixes'
Diffstat (limited to 'drivers/gpu/drm/drm_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 21058e6ad2b..82db1850666 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c | |||
| @@ -886,9 +886,6 @@ int drm_mode_group_init(struct drm_device *dev, struct drm_mode_group *group) | |||
| 886 | total_objects += dev->mode_config.num_connector; | 886 | total_objects += dev->mode_config.num_connector; |
| 887 | total_objects += dev->mode_config.num_encoder; | 887 | total_objects += dev->mode_config.num_encoder; |
| 888 | 888 | ||
| 889 | if (total_objects == 0) | ||
| 890 | return -EINVAL; | ||
| 891 | |||
| 892 | group->id_list = kzalloc(total_objects * sizeof(uint32_t), GFP_KERNEL); | 889 | group->id_list = kzalloc(total_objects * sizeof(uint32_t), GFP_KERNEL); |
| 893 | if (!group->id_list) | 890 | if (!group->id_list) |
| 894 | return -ENOMEM; | 891 | return -ENOMEM; |