Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3ab09f9 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[IRDA]: Use kmemdup where applicable 



Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
parent 8b2ed4bb

net/irda/iriap.c

+1 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ struct iriap_cb *iriap_open(__u8 slsap_sel, int mode, void *priv, 


	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);



	self = kmalloc(sizeof(struct iriap_cb), GFP_ATOMIC);

	self = kzalloc(sizeof(*self), GFP_ATOMIC);

	if (!self) {

		IRDA_WARNING("%s: Unable to kmalloc!\n", __FUNCTION__);

		return NULL;
@@ -181,7 +181,6 @@ struct iriap_cb *iriap_open(__u8 slsap_sel, int mode, void *priv, 
	/*

	 *  Initialize instance

	 */

	memset(self, 0, sizeof(struct iriap_cb));



	self->magic = IAS_MAGIC;

	self->mode = mode;

net/irda/irias_object.c

+1 −3
Original line number Diff line number Diff line
@@ -501,13 +501,12 @@ struct ias_value *irias_new_octseq_value(__u8 *octseq , int len) 
		len = IAS_MAX_OCTET_STRING;

	value->len = len;



	value->t.oct_seq = kmalloc(len, GFP_ATOMIC);

	value->t.oct_seq = kmemdup(octseq, len, GFP_ATOMIC);

	if (value->t.oct_seq == NULL){

		IRDA_WARNING("%s: Unable to kmalloc!\n", __FUNCTION__);

		kfree(value);

		return NULL;

	}

	memcpy(value->t.oct_seq, octseq , len);

	return value;

}
@@ -522,7 +521,6 @@ struct ias_value *irias_new_missing_value(void) 
	}



	value->type = IAS_MISSING;

	value->len = 0;



	return value;

}

net/irda/irlmp.c

+1 −3
Original line number Diff line number Diff line
@@ -641,15 +641,13 @@ struct lsap_cb *irlmp_dup(struct lsap_cb *orig, void *instance) 
	}



	/* Allocate a new instance */

	new = kmalloc(sizeof(struct lsap_cb), GFP_ATOMIC);

	new = kmemdup(orig, sizeof(*new), GFP_ATOMIC);

	if (!new)  {

		IRDA_DEBUG(0, "%s(), unable to kmalloc\n", __FUNCTION__);

		spin_unlock_irqrestore(&irlmp->unconnected_lsaps->hb_spinlock,

				       flags);

		return NULL;

	}

	/* Dup */

	memcpy(new, orig, sizeof(struct lsap_cb));

	/* new->lap = orig->lap; => done in the memcpy() */

	/* new->slsap_sel = orig->slsap_sel; => done in the memcpy() */

	new->conn_skb = NULL;

net/irda/irqueue.c

+1 −2
Original line number Diff line number Diff line
@@ -356,14 +356,13 @@ hashbin_t *hashbin_new(int type) 
	/*

	 * Allocate new hashbin

	 */

	hashbin = kmalloc( sizeof(hashbin_t), GFP_ATOMIC);

	hashbin = kzalloc(sizeof(*hashbin), GFP_ATOMIC);

	if (!hashbin)

		return NULL;



	/*

	 * Initialize structure

	 */

	memset(hashbin, 0, sizeof(hashbin_t));

	hashbin->hb_type = type;

	hashbin->magic = HB_MAGIC;

	//hashbin->hb_current = NULL;