* [PATCH Resend] HID: Fix return values in hid-core.c
@ 2012-09-17 11:11 Sachin Kamat
2012-09-17 11:16 ` Jiri Kosina
0 siblings, 1 reply; 2+ messages in thread
From: Sachin Kamat @ 2012-09-17 11:11 UTC (permalink / raw)
To: linux-input; +Cc: jkosina, sachin.kamat, patches
Return -ENOMEM instead of -1 if memory allocation fails.
Return -EINVAL instead of -1 for stack overflow and
underflow errors.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
drivers/hid/hid-core.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 16d6454..80b0218 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -126,7 +126,7 @@ static int open_collection(struct hid_parser *parser, unsigned type)
if (parser->collection_stack_ptr == HID_COLLECTION_STACK_SIZE) {
hid_err(parser->device, "collection stack overflow\n");
- return -1;
+ return -EINVAL;
}
if (parser->device->maxcollection == parser->device->collection_size) {
@@ -134,7 +134,7 @@ static int open_collection(struct hid_parser *parser, unsigned type)
parser->device->collection_size * 2, GFP_KERNEL);
if (collection == NULL) {
hid_err(parser->device, "failed to reallocate collection array\n");
- return -1;
+ return -ENOMEM;
}
memcpy(collection, parser->device->collection,
sizeof(struct hid_collection) *
@@ -170,7 +170,7 @@ static int close_collection(struct hid_parser *parser)
{
if (!parser->collection_stack_ptr) {
hid_err(parser->device, "collection stack underflow\n");
- return -1;
+ return -EINVAL;
}
parser->collection_stack_ptr--;
return 0;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH Resend] HID: Fix return values in hid-core.c
2012-09-17 11:11 [PATCH Resend] HID: Fix return values in hid-core.c Sachin Kamat
@ 2012-09-17 11:16 ` Jiri Kosina
0 siblings, 0 replies; 2+ messages in thread
From: Jiri Kosina @ 2012-09-17 11:16 UTC (permalink / raw)
To: Sachin Kamat; +Cc: linux-input, patches
On Mon, 17 Sep 2012, Sachin Kamat wrote:
> Return -ENOMEM instead of -1 if memory allocation fails.
> Return -EINVAL instead of -1 for stack overflow and
> underflow errors.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
> drivers/hid/hid-core.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index 16d6454..80b0218 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -126,7 +126,7 @@ static int open_collection(struct hid_parser *parser, unsigned type)
>
> if (parser->collection_stack_ptr == HID_COLLECTION_STACK_SIZE) {
> hid_err(parser->device, "collection stack overflow\n");
> - return -1;
> + return -EINVAL;
> }
>
> if (parser->device->maxcollection == parser->device->collection_size) {
> @@ -134,7 +134,7 @@ static int open_collection(struct hid_parser *parser, unsigned type)
> parser->device->collection_size * 2, GFP_KERNEL);
> if (collection == NULL) {
> hid_err(parser->device, "failed to reallocate collection array\n");
> - return -1;
> + return -ENOMEM;
> }
> memcpy(collection, parser->device->collection,
> sizeof(struct hid_collection) *
> @@ -170,7 +170,7 @@ static int close_collection(struct hid_parser *parser)
> {
> if (!parser->collection_stack_ptr) {
> hid_err(parser->device, "collection stack underflow\n");
> - return -1;
> + return -EINVAL;
> }
> parser->collection_stack_ptr--;
> return 0;
Applied, thanks.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-17 11:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-17 11:11 [PATCH Resend] HID: Fix return values in hid-core.c Sachin Kamat
2012-09-17 11:16 ` Jiri Kosina
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).