X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Firda%2Firlmp.c;h=d16ce9bb855ccf7e7964f69e2b9537449b6e01b7;hb=2cf7311f007833d5818fc9241c09a372c0325a4a;hp=320940a5c68746186ea03bc045bff9cd4899a33d;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c
index 320940a5c..d16ce9bb8 100644
--- a/net/irda/irlmp.c
+++ b/net/irda/irlmp.c
@@ -1491,7 +1491,7 @@ void *irlmp_register_service(__u16 hints)
 	service = kmalloc(sizeof(irlmp_service_t), GFP_ATOMIC);
 	if (!service) {
 		IRDA_DEBUG(1, "%s(), Unable to kmalloc!\n", __FUNCTION__);
-		return NULL;
+		return 0;
 	}
 	service->hints.word = hints;
 	hashbin_insert(irlmp->services, (irda_queue_t *) service,
@@ -1561,13 +1561,13 @@ void *irlmp_register_client(__u16 hint_mask, DISCOVERY_CALLBACK1 disco_clb,
 	irlmp_client_t *client;
 
 	IRDA_DEBUG(1, "%s()\n", __FUNCTION__);
-	ASSERT(irlmp != NULL, return NULL;);
+	ASSERT(irlmp != NULL, return 0;);
 
 	/* Make a new registration */
 	client = kmalloc(sizeof(irlmp_client_t), GFP_ATOMIC);
 	if (!client) {
 		IRDA_DEBUG( 1, "%s(), Unable to kmalloc!\n", __FUNCTION__);
-		return NULL;
+		return 0;
 	}
 
 	/* Register the details */