diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-08 11:05:59 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-08 11:05:59 -0800 |
| commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
| tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /drivers/gpu/drm/i915/intel_sdvo.c | |
| parent | b8c31da64165b8566fc6e1c9c826f76e7b98ff02 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index fbbaa4f414a..40721546910 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -978,7 +978,7 @@ static const struct drm_encoder_funcs intel_sdvo_enc_funcs = { }; -void intel_sdvo_init(struct drm_device *dev, int output_device) +bool intel_sdvo_init(struct drm_device *dev, int output_device) { struct drm_connector *connector; struct intel_output *intel_output; @@ -991,7 +991,7 @@ void intel_sdvo_init(struct drm_device *dev, int output_device) intel_output = kcalloc(sizeof(struct intel_output)+sizeof(struct intel_sdvo_priv), 1, GFP_KERNEL); if (!intel_output) { - return; + return false; } connector = &intel_output->base; @@ -1116,7 +1116,7 @@ void intel_sdvo_init(struct drm_device *dev, int output_device) intel_output->ddc_bus = i2cbus; - return; + return true; err_i2c: intel_i2c_destroy(intel_output->i2c_bus); @@ -1124,5 +1124,5 @@ err_connector: drm_connector_cleanup(connector); kfree(intel_output); - return; + return false; } |