---

yaml --- r: 320511 b: refs/heads/master c: ea4b385 h: refs/heads/master i: 320509: 5bc8412 320507: 40887a1 320503: 7fe240f 320495: 65c5e0f 320479: 759b15d 320447: 41aadcf 320383: c042d87 320255: 37c6886 319999: 0a16c7c 319487: d09cb98 v: v3
git-mirror · Jul 30, 2012 · b066fb5 · b066fb5
1 parent 853aa7c
commit b066fb5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61648d91fc278fd1d500da8061d17e6920cd3500
+refs/heads/master: ea4b3857861fe147137517da200d04cbbc91ad49
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -9360,8 +9360,7 @@ static int __devinit bnx2x_prev_mark_path(struct bnx2x *bp)
 	struct bnx2x_prev_path_list *tmp_list;
 	int rc;
 
-	tmp_list = (struct bnx2x_prev_path_list *)
-		    kmalloc(sizeof(struct bnx2x_prev_path_list), GFP_KERNEL);
+	tmp_list = kmalloc(sizeof(struct bnx2x_prev_path_list), GFP_KERNEL);
 	if (!tmp_list) {
 		BNX2X_ERR("Failed to allocate 'bnx2x_prev_path_list'\n");
 		return -ENOMEM;