@@ -1106,7 +1106,7 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
 	ptrptr = kmalloc_array(num_packets, sizeof(*ptrptr), GFP_KERNEL);
 	if (!ptrptr) {
 		retval = -ENOMEM;
-		goto failed;
+		goto stop_broadcast;
 	}
 	dev->broadcast_rcv_buffer_ptrs = ptrptr;
 

@@ -1116,13 +1116,13 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
 					fwnet_receive_broadcast, dev);
 	if (IS_ERR(context)) {
 		retval = PTR_ERR(context);
-		goto failed;
+		goto stop_broadcast;
 	}
 
 	retval = fw_iso_buffer_init(&dev->broadcast_rcv_buffer, dev->card,
 				    FWNET_ISO_PAGE_COUNT, DMA_FROM_DEVICE);
 	if (retval < 0)
-		goto failed;
+		goto stop_broadcast;
 
 	dev->broadcast_state = FWNET_BROADCAST_STOPPED;
 

@@ -1148,7 +1148,7 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
 		retval = fw_iso_context_queue(context, &packet,
 				&dev->broadcast_rcv_buffer, offset);
 		if (retval < 0)
-			goto failed;
+			goto stop_broadcast;
 
 		offset += max_receive;
 	}

@@ -1158,7 +1158,7 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
 	retval = fw_iso_context_start(context, -1, 0,
 			FW_ISO_CONTEXT_MATCH_ALL_TAGS); /* ??? sync */
 	if (retval < 0)
-		goto failed;
+		goto stop_broadcast;
 
 	/* FIXME: adjust it according to the min. speed of all known peers? */
 	dev->broadcast_xmt_max_payload = IEEE1394_MAX_PAYLOAD_S100

@@ -1166,8 +1166,7 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
 	dev->broadcast_state = FWNET_BROADCAST_RUNNING;
 
 	return 0;
-
- failed:
+ stop_broadcast:
 	__fwnet_broadcast_stop(dev);
 	return retval;
 }