On Fri, 14 Sep 2012, Sachin Kamat wrote: > Return -ENOMEM instead of -1 if memory allocation fails. > > Signed-off-by: Sachin Kamat <sachin.kamat@xxxxxxxxxx> > --- > drivers/hid/hid-core.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c > index 16d6454..1011a22 100644 > --- a/drivers/hid/hid-core.c > +++ b/drivers/hid/hid-core.c > @@ -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; While you are at it, could you please update the return value in case the collection stack overflows? I'd go with EINVAL. Thanks. > } > memcpy(collection, parser->device->collection, > sizeof(struct hid_collection) * > -- > 1.7.4.1 > -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html