* [PATCH] GPU:drm: returning ENOMEM
@ 2021-08-28 15:40 F.A.Sulaiman
2021-08-30 16:02 ` [PATCH v2] GPU:DRM: " F.A.Sulaiman
0 siblings, 1 reply; 3+ messages in thread
From: F.A.Sulaiman @ 2021-08-28 15:40 UTC (permalink / raw)
To: airlied, sean, tzimmermann, airlied, daniel
Cc: F.A.Sulaiman, dri-devel, linux-kernel
When memory allocation is failed this patch returns out of memory error instead of -1.
Signed-off-by: F.A. SULAIMAN <asha.16@itfac.mrt.ac.lk>
---
drivers/gpu/drm/udl/udl_connector.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index 3750fd216131..afebab6186ab 100644
--- a/drivers/gpu/drm/udl/udl_connector.c
+++ b/drivers/gpu/drm/udl/udl_connector.c
@@ -24,7 +24,7 @@ static int udl_get_edid_block(void *data, u8 *buf, unsigned int block,
read_buff = kmalloc(2, GFP_KERNEL);
if (!read_buff)
- return -1;
+ return -ENOMEM;
for (i = 0; i < len; i++) {
int bval = (i + block * EDID_LENGTH) << 8;
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2] GPU:DRM: returning ENOMEM
2021-08-28 15:40 [PATCH] GPU:drm: returning ENOMEM F.A.Sulaiman
@ 2021-08-30 16:02 ` F.A.Sulaiman
2021-08-30 16:06 ` Simon Ser
0 siblings, 1 reply; 3+ messages in thread
From: F.A.Sulaiman @ 2021-08-30 16:02 UTC (permalink / raw)
To: airlied, sean, airlied, daniel; +Cc: F.A.Sulaiman, dri-devel, linux-kernel
check the return value and pass the proper error code.
Signed-off-by: F.A. SULAIMAN <asha.16@itfac.mrt.ac.lk>
---
drivers/gpu/drm/udl/udl_connector.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index cdc1c42e1669..857d2c97ef0e 100644
--- a/drivers/gpu/drm/udl/udl_connector.c
+++ b/drivers/gpu/drm/udl/udl_connector.c
@@ -23,7 +23,7 @@ static int udl_get_edid_block(void *data, u8 *buf, unsigned int block,
read_buff = kmalloc(2, GFP_KERNEL);
if (!read_buff)
- return -1;
+ return -ENOMEM;
for (i = 0; i < len; i++) {
int bval = (i + block * EDID_LENGTH) << 8;
@@ -31,11 +31,16 @@ static int udl_get_edid_block(void *data, u8 *buf, unsigned int block,
usb_rcvctrlpipe(udl->udev, 0),
(0x02), (0x80 | (0x02 << 5)), bval,
0xA1, read_buff, 2, HZ);
- if (ret < 1) {
+ if (ret == 0) {
+ DRM_ERROR("Reading EDID block %d returned empty result\n", i);
+ kfree(read_buff);
+ return -EINVAL;
+ } else if (ret < 0) {
DRM_ERROR("Read EDID byte %d failed err %x\n", i, ret);
kfree(read_buff);
- return -1;
+ return ret;
}
+
buf[i] = read_buff[1];
}
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] GPU:DRM: returning ENOMEM
2021-08-30 16:02 ` [PATCH v2] GPU:DRM: " F.A.Sulaiman
@ 2021-08-30 16:06 ` Simon Ser
0 siblings, 0 replies; 3+ messages in thread
From: Simon Ser @ 2021-08-30 16:06 UTC (permalink / raw)
To: F.A.Sulaiman; +Cc: airlied, sean, airlied, daniel, dri-devel, linux-kernel
Maybe the commit message can be improved a bit? Add a prefix to make it
clear this is about the udl driver, make it clear this is about the
udl_get_edid_block function. The new `return ret` statement may return
something different from ENOMEM.
This would give something among these lines:
drm/udl: return -errno in udl_get_edid_block
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-30 16:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-28 15:40 [PATCH] GPU:drm: returning ENOMEM F.A.Sulaiman
2021-08-30 16:02 ` [PATCH v2] GPU:DRM: " F.A.Sulaiman
2021-08-30 16:06 ` Simon Ser
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).