diff --git a/[refs] b/[refs] index c890c46136c0..2e7eac7a9ea7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba2d00e816a11b532e0c035e5cf7b9311e72ac00 +refs/heads/master: bfe2ed8f4df2e7b6991c4039bb624dee5f8b6583 diff --git a/trunk/drivers/net/wireless/libertas/dev.h b/trunk/drivers/net/wireless/libertas/dev.h index 814838916b82..b9ff0dc53e8d 100644 --- a/trunk/drivers/net/wireless/libertas/dev.h +++ b/trunk/drivers/net/wireless/libertas/dev.h @@ -190,8 +190,8 @@ static inline int lbs_iface_active(struct lbs_private *priv) int r; r = netif_running(priv->dev); - if (priv->mesh_dev); - r |= netif_running(priv->dev); + if (priv->mesh_dev) + r |= netif_running(priv->mesh_dev); return r; }