diff options
Diffstat (limited to 'net/irda')
-rw-r--r-- | net/irda/irias_object.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/irda/irias_object.c b/net/irda/irias_object.c index 75f2666e8630..c6d169fbdceb 100644 --- a/net/irda/irias_object.c +++ b/net/irda/irias_object.c | |||
@@ -82,8 +82,7 @@ struct ias_object *irias_new_object( char *name, int id) | |||
82 | 82 | ||
83 | IRDA_DEBUG( 4, "%s()\n", __FUNCTION__); | 83 | IRDA_DEBUG( 4, "%s()\n", __FUNCTION__); |
84 | 84 | ||
85 | obj = (struct ias_object *) kmalloc(sizeof(struct ias_object), | 85 | obj = kmalloc(sizeof(struct ias_object), GFP_ATOMIC); |
86 | GFP_ATOMIC); | ||
87 | if (obj == NULL) { | 86 | if (obj == NULL) { |
88 | IRDA_WARNING("%s(), Unable to allocate object!\n", | 87 | IRDA_WARNING("%s(), Unable to allocate object!\n", |
89 | __FUNCTION__); | 88 | __FUNCTION__); |
@@ -348,8 +347,7 @@ void irias_add_integer_attrib(struct ias_object *obj, char *name, int value, | |||
348 | IRDA_ASSERT(obj->magic == IAS_OBJECT_MAGIC, return;); | 347 | IRDA_ASSERT(obj->magic == IAS_OBJECT_MAGIC, return;); |
349 | IRDA_ASSERT(name != NULL, return;); | 348 | IRDA_ASSERT(name != NULL, return;); |
350 | 349 | ||
351 | attrib = (struct ias_attrib *) kmalloc(sizeof(struct ias_attrib), | 350 | attrib = kmalloc(sizeof(struct ias_attrib), GFP_ATOMIC); |
352 | GFP_ATOMIC); | ||
353 | if (attrib == NULL) { | 351 | if (attrib == NULL) { |
354 | IRDA_WARNING("%s: Unable to allocate attribute!\n", | 352 | IRDA_WARNING("%s: Unable to allocate attribute!\n", |
355 | __FUNCTION__); | 353 | __FUNCTION__); |
@@ -385,8 +383,7 @@ void irias_add_octseq_attrib(struct ias_object *obj, char *name, __u8 *octets, | |||
385 | IRDA_ASSERT(name != NULL, return;); | 383 | IRDA_ASSERT(name != NULL, return;); |
386 | IRDA_ASSERT(octets != NULL, return;); | 384 | IRDA_ASSERT(octets != NULL, return;); |
387 | 385 | ||
388 | attrib = (struct ias_attrib *) kmalloc(sizeof(struct ias_attrib), | 386 | attrib = kmalloc(sizeof(struct ias_attrib), GFP_ATOMIC); |
389 | GFP_ATOMIC); | ||
390 | if (attrib == NULL) { | 387 | if (attrib == NULL) { |
391 | IRDA_WARNING("%s: Unable to allocate attribute!\n", | 388 | IRDA_WARNING("%s: Unable to allocate attribute!\n", |
392 | __FUNCTION__); | 389 | __FUNCTION__); |
@@ -420,8 +417,7 @@ void irias_add_string_attrib(struct ias_object *obj, char *name, char *value, | |||
420 | IRDA_ASSERT(name != NULL, return;); | 417 | IRDA_ASSERT(name != NULL, return;); |
421 | IRDA_ASSERT(value != NULL, return;); | 418 | IRDA_ASSERT(value != NULL, return;); |
422 | 419 | ||
423 | attrib = (struct ias_attrib *) kmalloc(sizeof( struct ias_attrib), | 420 | attrib = kmalloc(sizeof( struct ias_attrib), GFP_ATOMIC); |
424 | GFP_ATOMIC); | ||
425 | if (attrib == NULL) { | 421 | if (attrib == NULL) { |
426 | IRDA_WARNING("%s: Unable to allocate attribute!\n", | 422 | IRDA_WARNING("%s: Unable to allocate attribute!\n", |
427 | __FUNCTION__); | 423 | __FUNCTION__); |