| Message ID | 20170719223503.30580-1-christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 19/07/2017 23:35, Christophe JAILLET wrote: > Goto the right label in case of error, otherwise there is a leak. > This has been introduced by c5cf9a9147ff. In this patch a goto has not been > updated. > > Fixes: c5cf9a9147ff ("drm/i915: Create a kmem_cache to allocate struct i915_priolist from") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c > index 627e2aa09766..8cdec455cf7d 100644 > --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c > +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c > @@ -206,7 +206,7 @@ struct drm_i915_private *mock_gem_device(void) > mkwrite_device_info(i915)->ring_mask = BIT(0); > i915->engine[RCS] = mock_engine(i915, "mock"); > if (!i915->engine[RCS]) > - goto err_dependencies; > + goto err_priorities; > > i915->kernel_context = mock_context(i915, NULL); > if (!i915->kernel_context) Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Regards, Tvrtko
Quoting Tvrtko Ursulin (2017-07-20 11:09:53) > > On 19/07/2017 23:35, Christophe JAILLET wrote: > > Goto the right label in case of error, otherwise there is a leak. > > This has been introduced by c5cf9a9147ff. In this patch a goto has not been > > updated. > > > > Fixes: c5cf9a9147ff ("drm/i915: Create a kmem_cache to allocate struct i915_priolist from") > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > > --- > > drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c > > index 627e2aa09766..8cdec455cf7d 100644 > > --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c > > +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c > > @@ -206,7 +206,7 @@ struct drm_i915_private *mock_gem_device(void) > > mkwrite_device_info(i915)->ring_mask = BIT(0); > > i915->engine[RCS] = mock_engine(i915, "mock"); > > if (!i915->engine[RCS]) > > - goto err_dependencies; > > + goto err_priorities; > > > > i915->kernel_context = mock_context(i915, NULL); > > if (!i915->kernel_context) > > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Thanks for the fix and review, pushed. -Chris
diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c index 627e2aa09766..8cdec455cf7d 100644 --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c @@ -206,7 +206,7 @@ struct drm_i915_private *mock_gem_device(void) mkwrite_device_info(i915)->ring_mask = BIT(0); i915->engine[RCS] = mock_engine(i915, "mock"); if (!i915->engine[RCS]) - goto err_dependencies; + goto err_priorities; i915->kernel_context = mock_context(i915, NULL); if (!i915->kernel_context)
Goto the right label in case of error, otherwise there is a leak. This has been introduced by c5cf9a9147ff. In this patch a goto has not been updated. Fixes: c5cf9a9147ff ("drm/i915: Create a kmem_cache to allocate struct i915_priolist from") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)