diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-13 11:48:01 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-13 11:48:01 +0900 |
| commit | e290861f99131fc42d98012a9ea2dc185f08f8f9 (patch) | |
| tree | 5c8b92d095d74d03b281711c81bac54bd59989cd /drivers/gpu/drm/drm_crtc.c | |
| parent | b4a757367d36cebddcd332a4024d92f1e87af370 (diff) | |
| parent | dbefd606a3b3634799b625f4900336e61c89e868 (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'drivers/gpu/drm/drm_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 8fab7890a36..33be210d672 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -1461,7 +1461,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, goto out; } - if (crtc_req->count_connectors > 0 && !mode && !fb) { + if (crtc_req->count_connectors > 0 && (!mode || !fb)) { DRM_DEBUG("Count connectors is %d but no mode or fb set\n", crtc_req->count_connectors); ret = -EINVAL; |