diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-01-27 08:54:11 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-27 08:54:11 +1000 |
| commit | e4514003c6d0afd0a2d7e23e397530d746f34057 (patch) | |
| tree | 0a87f4514fc938b2f9df5a731f03fb1c23c11a3e /drivers/gpu/drm/drm_fb_helper.c | |
| parent | bdfcea4bdcd354023b1a93abdaf6b176c3dd545b (diff) | |
| parent | b7703726251191cd9f3ef3a80b2d9667901eec95 (diff) | |
Merge tag 'topic/core-stuff-2015-01-23' of git://anongit.freedesktop.org/drm-intel into drm-next
Just flushing out my drm-misc branch, nothing major. Well too old patches
I've dug out from years since a patch from Rob look eerily familiar ;-)
* tag 'topic/core-stuff-2015-01-23' of git://anongit.freedesktop.org/drm-intel:
drm/probe-helper: clamp unknown connector status in the poll work
drm/probe-helper: don't lose hotplug event
next: drm/atomic: Use copy_from_user to copy 64 bit data from user space
drm: Make drm_read() more robust against multithreaded races
drm/fb-helper: Propagate errors from initial config failure
drm: Drop superfluous "select VT_HW_CONSOLE_BINDING"
Diffstat (limited to 'drivers/gpu/drm/drm_fb_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index cf775a4449c1..d5c1db55abf7 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1692,7 +1692,7 @@ out: * RETURNS: * Zero if everything went ok, nonzero otherwise. */ -bool drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel) +int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel) { struct drm_device *dev = fb_helper->dev; int count = 0; |