27c27
< * $FreeBSD: head/sys/dev/etherswitch/arswitch/arswitch_phy.c 235288 2012-05-11 20:53:20Z adrian $
---
> * $FreeBSD: head/sys/dev/etherswitch/arswitch/arswitch_phy.c 241578 2012-10-15 12:20:40Z ray $
77a78
> struct arswitch_softc *sc;
80a82,84
> sc = device_get_softc(dev);
> ARSWITCH_LOCK_ASSERT(sc, MA_NOTOWNED);
>
84a89,90
>
> ARSWITCH_LOCK(sc);
92c98
< return (-1);
---
> goto fail;
99c105
< err = EIO;
---
> goto fail;
101a108
> ARSWITCH_UNLOCK(sc);
102a110,113
>
> fail:
> ARSWITCH_UNLOCK(sc);
> return (-1);
107a119
> struct arswitch_softc *sc;
110c122,125
<
---
>
> sc = device_get_softc(dev);
> ARSWITCH_LOCK_ASSERT(sc, MA_NOTOWNED);
>
112a128,129
>
> ARSWITCH_LOCK(sc);
115d131
< DEVERR(dev, err, "arswitch_writephy()=%d: phy=%d.%02x\n", phy, reg);
117c133
< return (err);
---
> goto out;
124d139
< DEVERR(dev, err, "arswitch_writephy()=%d: phy=%d.%02x\n", phy, reg);
126c141
< return (err);
---
> goto out;
133a149
> out:
134a151
> ARSWITCH_UNLOCK(sc);