diff options
-rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 12 | ||||
-rw-r--r-- | include/drm/drm_crtc.h | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index e79c8d3700d8..d4d783477c99 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c | |||
@@ -3938,8 +3938,9 @@ done: | |||
3938 | return ret; | 3938 | return ret; |
3939 | } | 3939 | } |
3940 | 3940 | ||
3941 | static struct drm_property_blob *drm_property_create_blob(struct drm_device *dev, int length, | 3941 | static struct drm_property_blob * |
3942 | void *data) | 3942 | drm_property_create_blob(struct drm_device *dev, size_t length, |
3943 | void *data) | ||
3943 | { | 3944 | { |
3944 | struct drm_property_blob *blob; | 3945 | struct drm_property_blob *blob; |
3945 | int ret; | 3946 | int ret; |
@@ -4023,8 +4024,8 @@ int drm_mode_connector_set_path_property(struct drm_connector *connector, | |||
4023 | char *path) | 4024 | char *path) |
4024 | { | 4025 | { |
4025 | struct drm_device *dev = connector->dev; | 4026 | struct drm_device *dev = connector->dev; |
4026 | int ret, size; | 4027 | size_t size = strlen(path) + 1; |
4027 | size = strlen(path) + 1; | 4028 | int ret; |
4028 | 4029 | ||
4029 | connector->path_blob_ptr = drm_property_create_blob(connector->dev, | 4030 | connector->path_blob_ptr = drm_property_create_blob(connector->dev, |
4030 | size, path); | 4031 | size, path); |
@@ -4053,7 +4054,8 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector, | |||
4053 | struct edid *edid) | 4054 | struct edid *edid) |
4054 | { | 4055 | { |
4055 | struct drm_device *dev = connector->dev; | 4056 | struct drm_device *dev = connector->dev; |
4056 | int ret, size; | 4057 | size_t size; |
4058 | int ret; | ||
4057 | 4059 | ||
4058 | /* ignore requests to set edid when overridden */ | 4060 | /* ignore requests to set edid when overridden */ |
4059 | if (connector->override_edid) | 4061 | if (connector->override_edid) |
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index c40070a92d6b..628369c08503 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h | |||
@@ -196,7 +196,7 @@ struct drm_framebuffer { | |||
196 | struct drm_property_blob { | 196 | struct drm_property_blob { |
197 | struct drm_mode_object base; | 197 | struct drm_mode_object base; |
198 | struct list_head head; | 198 | struct list_head head; |
199 | unsigned int length; | 199 | size_t length; |
200 | unsigned char data[]; | 200 | unsigned char data[]; |
201 | }; | 201 | }; |
202 | 202 | ||