---

yaml --- r: 97947 b: refs/heads/master c: e5bd7be h: refs/heads/master i: 97945: f847177 97943: 690a2dc v: v3
git-mirror · Jun 10, 2008 · dab221e · dab221e
1 parent 7771f9f
commit dab221e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 363f15149cfba67d29f1e6a6103dda079f27f3fa
+refs/heads/master: e5bd7be56787f8c5042081157fff983bcf0c8a42
diff --git a/trunk/drivers/s390/net/qeth_l3_main.c b/trunk/drivers/s390/net/qeth_l3_main.c
@@ -2070,7 +2070,7 @@ static struct qeth_card *qeth_l3_get_card_from_dev(struct net_device *dev)
 		card = netdev_priv(dev);
 	else if (rc == QETH_VLAN_CARD)
 		card = netdev_priv(vlan_dev_info(dev)->real_dev);
-	if (card->options.layer2)
+	if (card && card->options.layer2)
 		card = NULL;
 	QETH_DBF_TEXT_(TRACE, 4, "%d", rc);
 	return card ;