| Message ID | 5109E49E.1070005@jp.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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@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? Thanks, Daniel > --- > drivers/gpu/drm/i915/intel_opregion.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > Index: linux-pm/drivers/gpu/drm/i915/intel_opregion.c > =================================================================== > --- linux-pm.orig/drivers/gpu/drm/i915/intel_opregion.c 2013-01-31 11:39:37.075849905 +0900 > +++ linux-pm/drivers/gpu/drm/i915/intel_opregion.c 2013-01-31 11:52:18.796850274 +0900 > @@ -347,7 +347,7 @@ static void intel_didl_outputs(struct dr > 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)) >
Index: linux-pm/drivers/gpu/drm/i915/intel_opregion.c =================================================================== --- linux-pm.orig/drivers/gpu/drm/i915/intel_opregion.c 2013-01-31 11:39:37.075849905 +0900 +++ linux-pm/drivers/gpu/drm/i915/intel_opregion.c 2013-01-31 11:52:18.796850274 +0900 @@ -347,7 +347,7 @@ static void intel_didl_outputs(struct dr 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))
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@jp.fujitsu.com> --- drivers/gpu/drm/i915/intel_opregion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)