diff mbox

[Resend] HID: Fix return values in hid-core.c

Message ID 1347880316-24604-1-git-send-email-sachin.kamat@linaro.org (mailing list archive)
State New, archived
Delegated to: Jiri Kosina
Headers show

Commit Message

Sachin Kamat Sept. 17, 2012, 11:11 a.m. UTC
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(-)

Comments

Jiri Kosina Sept. 17, 2012, 11:16 a.m. UTC | #1
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.
diff mbox

Patch

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;