firewire net: Allocate dev->broadcast_rcv_buffer_ptrs early.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 0dc2fdf00562..21210fb94762 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -1163,6 +1163,13 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
         max_receive = 1U << (dev->card->max_receive + 1);
         num_packets = (FWNET_ISO_PAGE_COUNT * PAGE_SIZE) / max_receive;
 
+        ptrptr = kmalloc(sizeof(void *) * num_packets, GFP_KERNEL);
+        if (!ptrptr) {
+                retval = -ENOMEM;
+                goto failed_ptrs_alloc;
+        }
+        dev->broadcast_rcv_buffer_ptrs = ptrptr;
+
         context = fw_iso_context_create(dev->card, FW_ISO_CONTEXT_RECEIVE,
                                         IEEE1394_BROADCAST_CHANNEL,
                                         dev->card->link_speed, 8,
@@ -1177,13 +1184,6 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
         if (retval < 0)
                 goto failed_buffer_init;
 
-        ptrptr = kmalloc(sizeof(void *) * num_packets, GFP_KERNEL);
-        if (!ptrptr) {
-                retval = -ENOMEM;
-                goto failed_ptrs_alloc;
-        }
-
-        dev->broadcast_rcv_buffer_ptrs = ptrptr;
         for (u = 0; u < FWNET_ISO_PAGE_COUNT; u++) {
                 void *ptr;
                 unsigned v;
@@ -1226,16 +1226,16 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
         return 0;
 
  failed_rcv_queue:
-        kfree(dev->broadcast_rcv_buffer_ptrs);
-        dev->broadcast_rcv_buffer_ptrs = NULL;
         for (u = 0; u < FWNET_ISO_PAGE_COUNT; u++)
                 kunmap(dev->broadcast_rcv_buffer.pages[u]);
- failed_ptrs_alloc:
         fw_iso_buffer_destroy(&dev->broadcast_rcv_buffer, dev->card);
  failed_buffer_init:
         fw_iso_context_destroy(context);
         dev->broadcast_rcv_context = NULL;
  failed_context_create:
+        kfree(dev->broadcast_rcv_buffer_ptrs);
+        dev->broadcast_rcv_buffer_ptrs = NULL;
+ failed_ptrs_alloc:
 
         return retval;
 }
@@ -1626,8 +1626,6 @@ static int fwnet_remove(struct device *_dev)
 
                         fw_iso_context_stop(dev->broadcast_rcv_context);
 
-                        kfree(dev->broadcast_rcv_buffer_ptrs);
-                        dev->broadcast_rcv_buffer_ptrs = NULL;
                         for (u = 0; u < FWNET_ISO_PAGE_COUNT; u++)
                                 kunmap(dev->broadcast_rcv_buffer.pages[u]);
 
@@ -1635,6 +1633,8 @@ static int fwnet_remove(struct device *_dev)
                                               dev->card);
                         fw_iso_context_destroy(dev->broadcast_rcv_context);
                         dev->broadcast_rcv_context = NULL;
+                        kfree(dev->broadcast_rcv_buffer_ptrs);
+                        dev->broadcast_rcv_buffer_ptrs = NULL;
                         dev->broadcast_state = FWNET_BROADCAST_ERROR;
                 }
                 for (i = 0; dev->queued_datagrams && i < 5; i++)