Commit d50f7479 authored by Thomas Zimmermann's avatar Thomas Zimmermann

drm/mgag200: Fail on I2C initialization errors

Initialization of the I2C adapter was allowed to fail. The mgag200
driver would have continued without DDC support. Had this happened in
practice, it would have led to segmentation faults in the connector
code. Resolve this problem by failing driver initialization on I2C-
related errors.

v2:
	* initialize 'ret' before drm_err() (kernel test robot)
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Tested-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220516134343.6085-3-tzimmermann@suse.de
parent 5913ab94
...@@ -120,7 +120,7 @@ struct mga_i2c_chan *mgag200_i2c_create(struct drm_device *dev) ...@@ -120,7 +120,7 @@ struct mga_i2c_chan *mgag200_i2c_create(struct drm_device *dev)
i2c = kzalloc(sizeof(struct mga_i2c_chan), GFP_KERNEL); i2c = kzalloc(sizeof(struct mga_i2c_chan), GFP_KERNEL);
if (!i2c) if (!i2c)
return NULL; return ERR_PTR(-ENOMEM);
i2c->data = data; i2c->data = data;
i2c->clock = clock; i2c->clock = clock;
...@@ -142,11 +142,14 @@ struct mga_i2c_chan *mgag200_i2c_create(struct drm_device *dev) ...@@ -142,11 +142,14 @@ struct mga_i2c_chan *mgag200_i2c_create(struct drm_device *dev)
i2c->bit.getscl = mga_gpio_getscl; i2c->bit.getscl = mga_gpio_getscl;
ret = i2c_bit_add_bus(&i2c->adapter); ret = i2c_bit_add_bus(&i2c->adapter);
if (ret) { if (ret)
kfree(i2c); goto err_kfree;
i2c = NULL;
}
return i2c; return i2c;
err_kfree:
kfree(i2c);
return ERR_PTR(ret);
} }
void mgag200_i2c_destroy(struct mga_i2c_chan *i2c) void mgag200_i2c_destroy(struct mga_i2c_chan *i2c)
......
...@@ -849,8 +849,11 @@ static int mgag200_vga_connector_init(struct mga_device *mdev) ...@@ -849,8 +849,11 @@ static int mgag200_vga_connector_init(struct mga_device *mdev)
int ret; int ret;
i2c = mgag200_i2c_create(dev); i2c = mgag200_i2c_create(dev);
if (!i2c) if (IS_ERR(i2c)) {
drm_warn(dev, "failed to add DDC bus\n"); ret = PTR_ERR(i2c)
drm_err(dev, "failed to add DDC bus: %d\n", ret);
return ret;
}
ret = drm_connector_init_with_ddc(dev, connector, ret = drm_connector_init_with_ddc(dev, connector,
&mga_vga_connector_funcs, &mga_vga_connector_funcs,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment