Module Name: src
Committed By: snj
Date: Tue Mar 8 09:52:39 UTC 2016
Modified Files:
src/sys/dev/usb [netbsd-7]: if_smsc.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1135):
sys/dev/usb/if_smsc.c: revision 1.26
PR/50904: Fix variable assignment inside if-clause.
To generate a diff of this commit:
cvs rdiff -u -r1.19.2.1 -r1.19.2.2 src/sys/dev/usb/if_smsc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.19.2.1 src/sys/dev/usb/if_smsc.c:1.19.2.2
--- src/sys/dev/usb/if_smsc.c:1.19.2.1 Mon Sep 22 11:11:10 2014
+++ src/sys/dev/usb/if_smsc.c Tue Mar 8 09:52:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.19.2.1 2014/09/22 11:11:10 martin Exp $ */
+/* $NetBSD: if_smsc.c,v 1.19.2.2 2016/03/08 09:52:39 snj Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -771,7 +771,7 @@ smsc_chip_init(struct smsc_softc *sc)
smsc_write_reg(sc, SMSC_PM_CTRL, SMSC_PM_CTRL_PHY_RST);
if ((err = smsc_wait_for_bits(sc, SMSC_PM_CTRL,
- SMSC_PM_CTRL_PHY_RST) != 0)) {
+ SMSC_PM_CTRL_PHY_RST)) != 0) {
smsc_warn_printf(sc, "timed-out waiting for phy reset to "
"complete\n");
goto init_failed;
