Merge remote-tracking branch 'samsung/for-next'

[karo-tx-linux.git] / drivers / atm / iphase.c

diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 65e65903faa072f5d9f8897bf9052112ad624866..7d00f2994738b45d91b6f3b0231856f35341fcb2 100644 (file)
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -112,7 +112,8 @@ static void ia_enque_head_rtn_q (IARTN_Q *que, IARTN_Q * data)
 
 static int ia_enque_rtn_q (IARTN_Q *que, struct desc_tbl_t data) {
    IARTN_Q *entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
-   if (!entry) return -1;
+   if (!entry)
+      return -ENOMEM;
    entry->data = data;
    entry->next = NULL;
    if (que->next == NULL) 
@@ -1175,7 +1176,7 @@ static int rx_pkt(struct atm_dev *dev)
         if (!(skb = atm_alloc_charge(vcc, len, GFP_ATOMIC))) {
            if (vcc->vci < 32)
               printk("Drop control packets\n");
-             goto out_free_desc;
+          goto out_free_desc;
         }
        skb_put(skb,len);  
         // pwang_test