[PATCH] drm/amdgpu: fix an error code in init_pmu_entry_by_type_and_add()

Dan Carpenter dan.carpenter at oracle.com
Wed Feb 17 11:37:28 UTC 2021


On Tue, Feb 16, 2021 at 02:52:55PM -0500, Alex Deucher wrote:
> On Tue, Feb 16, 2021 at 2:35 PM Dan Carpenter <dan.carpenter at oracle.com> wrote:
> >
> > If the kmemdup() fails then this should return a negative error code
> > but it currently returns success.
> >
> > Fixes: b4a7db71ea06 ("drm/amdgpu: add per device user friendly xgmi events for vega20")
> > Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>
> > ---
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c     | 4 +++-
> >  drivers/gpu/drm/nouveau/nouveau_backlight.c | 1 +
> >  2 files changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
> > index 19c0a3655228..82e9ecf84352 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
> > @@ -519,8 +519,10 @@ static int init_pmu_entry_by_type_and_add(struct amdgpu_pmu_entry *pmu_entry,
> >         pmu_entry->pmu.attr_groups = kmemdup(attr_groups, sizeof(attr_groups),
> >                                                                 GFP_KERNEL);
> >
> > -       if (!pmu_entry->pmu.attr_groups)
> > +       if (!pmu_entry->pmu.attr_groups) {
> > +               ret = -ENOMEM;
> >                 goto err_attr_group;
> > +       }
> >
> >         snprintf(pmu_name, PMU_NAME_SIZE, "%s_%d", pmu_entry->pmu_file_prefix,
> >                                 adev_to_drm(pmu_entry->adev)->primary->index);
> > diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
> > index 72f35a2babcb..3786b1c85182 100644
> > --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
> > +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
> > @@ -274,6 +274,7 @@ nouveau_backlight_init(struct drm_connector *connector)
> >
> >         if (!nouveau_get_backlight_name(backlight_name, bl)) {
> >                 NV_ERROR(drm, "Failed to retrieve a unique name for the backlight interface\n");
> > +               ret = -ENOMEM;
> >                 goto fail_alloc;
> >         }
> 
> This hunk looks unrelated?
> 

That's so weird...  I don't even have any clue how that would happen at
all..  Weee wooo weee woooo  ALIENS!

Anyway, I'll resend.  Thanks!

regards,
dan carpenter



More information about the amd-gfx mailing list