VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / net / irda / irlmp.c

diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c
index 0a9b1ca..320940a 100644 (file)
--- a/net/irda/irlmp.c
+++ b/net/irda/irlmp.c
@@ -804,7 +804,7 @@ void irlmp_disconnect_indication(struct lsap_cb *self, LM_REASON reason,
  * Note : separate from irlmp_do_discovery() so that we can handle
  * passive discovery properly.
  */
-void irlmp_do_expiry()
+void irlmp_do_expiry(void)
 {
        struct lap_cb *lap;
 
@@ -1078,7 +1078,7 @@ void irlmp_discovery_expiry(discinfo_t *expiries, int number)
  *    Used by IrLAP to get the discovery info it needs when answering
  *    discovery requests by other devices.
  */
-discovery_t *irlmp_get_discovery_response()
+discovery_t *irlmp_get_discovery_response(void)
 {
        IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
 
@@ -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 0;
+               return NULL;
        }
        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 0;);
+       ASSERT(irlmp != NULL, return NULL;);
 
        /* Make a new registration */
        client = kmalloc(sizeof(irlmp_client_t), GFP_ATOMIC);
        if (!client) {
                IRDA_DEBUG( 1, "%s(), Unable to kmalloc!\n", __FUNCTION__);
-               return 0;
+               return NULL;
        }
 
        /* Register the details */