| Message ID | 83d9bb89-1a16-4ca4-80b4-1965fca498c1@stanley.mountain (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/plane: Fix IS_ERR() vs NULL bug | expand |
On Sat, Jul 27, 2024 at 1:32 AM Dan Carpenter <dan.carpenter@linaro.org> wrote: > > The drm_property_create_signed_range() function returns NULL on error, > it doesn't return error pointers. Change the IS_ERR() tests to check > for NULL. > > Fixes: 8f7179a1027d ("drm/atomic: Add support for mouse hotspots") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > --- > drivers/gpu/drm/drm_plane.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c > index a28b22fdd7a4..4fcb5d486de6 100644 > --- a/drivers/gpu/drm/drm_plane.c > +++ b/drivers/gpu/drm/drm_plane.c > @@ -328,14 +328,14 @@ static int drm_plane_create_hotspot_properties(struct drm_plane *plane) > > prop_x = drm_property_create_signed_range(plane->dev, 0, "HOTSPOT_X", > INT_MIN, INT_MAX); > - if (IS_ERR(prop_x)) > - return PTR_ERR(prop_x); > + if (!prop_x) > + return -ENOMEM; > > prop_y = drm_property_create_signed_range(plane->dev, 0, "HOTSPOT_Y", > INT_MIN, INT_MAX); > - if (IS_ERR(prop_y)) { > + if (!prop_y) { > drm_property_destroy(plane->dev, prop_x); > - return PTR_ERR(prop_y); > + return -ENOMEM; > } > > drm_object_attach_property(&plane->base, prop_x, 0); Thanks, that looks good to me. Reviewed-by: Zack Rusin <zack.rusin@broadcom.com> z
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index a28b22fdd7a4..4fcb5d486de6 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -328,14 +328,14 @@ static int drm_plane_create_hotspot_properties(struct drm_plane *plane) prop_x = drm_property_create_signed_range(plane->dev, 0, "HOTSPOT_X", INT_MIN, INT_MAX); - if (IS_ERR(prop_x)) - return PTR_ERR(prop_x); + if (!prop_x) + return -ENOMEM; prop_y = drm_property_create_signed_range(plane->dev, 0, "HOTSPOT_Y", INT_MIN, INT_MAX); - if (IS_ERR(prop_y)) { + if (!prop_y) { drm_property_destroy(plane->dev, prop_x); - return PTR_ERR(prop_y); + return -ENOMEM; } drm_object_attach_property(&plane->base, prop_x, 0);
The drm_property_create_signed_range() function returns NULL on error, it doesn't return error pointers. Change the IS_ERR() tests to check for NULL. Fixes: 8f7179a1027d ("drm/atomic: Add support for mouse hotspots") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- drivers/gpu/drm/drm_plane.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)