diff --git a/[refs] b/[refs] index c852be374699..9d8f5e0aebd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbbb24947e1bea5e6034ae2edfbf1be5b8f2b062 +refs/heads/master: 1c863c8bcb653be8e2b17b49b24f752392746ee2 diff --git a/trunk/drivers/staging/et131x/et1310_phy.c b/trunk/drivers/staging/et131x/et1310_phy.c index 2385d04e7487..36534260fae1 100644 --- a/trunk/drivers/staging/et131x/et1310_phy.c +++ b/trunk/drivers/staging/et131x/et1310_phy.c @@ -908,9 +908,6 @@ void et1310_phy_init(struct et131x_adapter *etdev) { u16 data, index; - if (etdev == NULL) - return; - /* get the identity (again ?) */ et131x_mii_read(etdev, PHY_ID_1, &data); et131x_mii_read(etdev, PHY_ID_2, &data);