1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
index 988b2424e1c6..69ba57270481 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c
@@ -136,13 +136,12 @@ static void mlx4_en_event(struct mlx4_dev *dev, void *endev_ptr,
         struct mlx4_en_dev *mdev = (struct mlx4_en_dev *) endev_ptr;
         struct mlx4_en_priv *priv;
 
-        if (!mdev->pndev[port])
-                return;
-
-        priv = netdev_priv(mdev->pndev[port]);
         switch (event) {
         case MLX4_DEV_EVENT_PORT_UP:
         case MLX4_DEV_EVENT_PORT_DOWN:
+                if (!mdev->pndev[port])
+                        return;
+                priv = netdev_priv(mdev->pndev[port]);
                 /* To prevent races, we poll the link state in a separate
                   task rather than changing it here */
                 priv->link_state = event;
@@ -154,7 +153,10 @@ static void mlx4_en_event(struct mlx4_dev *dev, void *endev_ptr,
                 break;
 
         default:
-                mlx4_warn(mdev, "Unhandled event: %d\n", event);
+                if (port < 1 || port > dev->caps.num_ports ||
+                    !mdev->pndev[port])
+                        return;
+                mlx4_warn(mdev, "Unhandled event %d for port %d\n", event, port);
         }
 }