[UPDATE][PATCH 4/4] GPU/i915: Fix acpi_bus_get_device() check in drivers/gpu/drm/i915/intel_opregion.c

[Daniel Vetter]

On Fri, Feb 01, 2013 at 10:14:20AM +0900, Yasuaki Ishimatsu wrote:
> 2013/02/01 9:53, Yasuaki Ishimatsu wrote:
> >2013/02/01 9:50, Yasuaki Ishimatsu wrote:
> >>2013/01/31 19:03, Daniel Vetter wrote:
> >>>On Thu, Jan 31, 2013 at 12:27:26PM +0900, Yasuaki Ishimatsu wrote:
> >>>>I forgot to change subject. So I resend a patch.
> >>>>
> >>>>---
> >>>>acpi_bus_get_device() returns int not acpi_status.
> >>>>
> >>>>The patch change not to apply ACPI_FAILURE() to the return value of
> >>>>acpi_bus_get_device().
> >>>>
> >>>>Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki at jp.fujitsu.com>
> >>>
> >>>I've tried to apply this to drm-intel-next-queued, but git am didn't
> >>>really like your patch - it failed to apply. Can you please rebase to the
> >>>drm-intel-next-queued branch from
> >>>
> >>>git://people.freedesktop.org/~danvet/drm-intel
> >>>
> >>>and please resubmit the patch, preferrably formatted with git
> >>>format-patch?
> >>
> >>My mailer added a space in the patch. I updated the patch.
> >>How abot it?
> >>
> >>---
> >>acpi_bus_get_device() returns int not acpi_status.
> >>
> >>The patch change not to apply ACPI_FAILURE() to the return value of
> >>acpi_bus_get_device().
> >>
> >>Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki at jp.fujitsu.com>
> >>---
> >>  drivers/gpu/drm/i915/intel_opregion.c |    2 +-
> >>  1 files changed, 1 insertions(+), 1 deletions(-)
> >>
> >>diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> >>index 7741c22..4d33874 100644
> >>--- a/drivers/gpu/drm/i915/intel_opregion.c
> >>+++ b/drivers/gpu/drm/i915/intel_opregion.c
> >>@@ -347,7 +347,7 @@ static void intel_didl_outputs(struct drm_device *dev)
> >>      int i = 0;
> >>
> >>      handle = DEVICE_ACPI_HANDLE(&dev->pdev->dev);
> >>-    if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev)))
> >>+    if (!handle || acpi_bus_get_device(handle, &acpi_dev))
> >>          return;
> >>
> >>      if (acpi_is_video_device(acpi_dev))
> >>
> >
> >Oops. My mailer added a space again...
> >I'll check my mailer again.
> 
> I do not understand why space was added to the patch.
> So I attached the patch. Please check it.

Yeah, worked this time. Queued for -next, thanks for the patch.
-Daniel

> 
> Thanks,
> Yasuaki Ishimatsu
> 
> >
> >Thanks,
> >Yasuaki Ishimatsu
> >
> >>--
> >>To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> >>the body of a message to majordomo at vger.kernel.org
> >>More majordomo info at  http://vger.kernel.org/majordomo-info.html
> >
> >
> >--
> >To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> >the body of a message to majordomo at vger.kernel.org
> >More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

> acpi_bus_get_device() returns int not acpi_status.
> 
> The patch change not to apply ACPI_FAILURE() to the return value of
> acpi_bus_get_device().
> 
> Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki at jp.fujitsu.com>
> ---
>  drivers/gpu/drm/i915/intel_opregion.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> index 7741c22..4d33874 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -347,7 +347,7 @@ static void intel_didl_outputs(struct drm_device *dev)
>  	int i = 0;
>  
>  	handle = DEVICE_ACPI_HANDLE(&dev->pdev->dev);
> -	if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev)))
> +	if (!handle || acpi_bus_get_device(handle, &acpi_dev))
>  		return;
>  
>  	if (acpi_is_video_device(acpi_dev))
> 


-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch