svn commit: r224402 - stable/7/sys/dev/gem

[Pyun YongHyeon]

Author: yongari
Date: Mon Jul 25 20:13:35 2011
New Revision: 224402
URL: http://svn.freebsd.org/changeset/base/224402

Log:
  MFC r224157:
    Revert r222135 by allowing controller reinitialization.  Due to
    unknown reason Apple UniNorth2 gem(4) device required manual
    interface down/up operation after r222135.  Even though this is not
    correct thing and I don't like to revert it but it would be better
    than breaking gem(4) on PPC.  This should be revisited.
  
    PR:	kern/157405

Modified:
  stable/7/sys/dev/gem/if_gem.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/gem/if_gem.c
==============================================================================
--- stable/7/sys/dev/gem/if_gem.c	Mon Jul 25 20:12:31 2011	(r224401)
+++ stable/7/sys/dev/gem/if_gem.c	Mon Jul 25 20:13:35 2011	(r224402)
@@ -947,8 +947,10 @@ gem_init_locked(struct gem_softc *sc)
 
 	GEM_LOCK_ASSERT(sc, MA_OWNED);
 
+#ifdef notyet
 	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
 		return;
+#endif
 
 #ifdef GEM_DEBUG
 	CTR2(KTR_GEM, "%s: %s: calling stop", device_get_name(sc->sc_dev),