On 26.06.2015 15:25, Maninder Singh wrote: > kfree(NULL) is safe and this check is probably not required > > Signed-off-by: Maninder Singh <maninder1.s at samsung.com> > Reviewed-by: Vaneet Narang <v.narang at samsung.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index fec487d..a85cd08 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -1575,8 +1575,7 @@ void amdgpu_device_fini(struct amdgpu_device *adev) > amdgpu_fence_driver_fini(adev); > amdgpu_fbdev_fini(adev); > r = amdgpu_fini(adev); > - if (adev->ip_block_enabled) > - kfree(adev->ip_block_enabled); > + kfree(adev->ip_block_enabled); > adev->ip_block_enabled = NULL; > adev->accel_working = false; > /* free i2c buses */ >
The shortlog prefix of both your patches should be "drm/amdgpu:" instead of "gpu/drm:". With that fixed, both are Reviewed-by: Michel Dänzer <michel.daenzer at amd.com> -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer