From owner-svn-src-all@freebsd.org Sun Aug 14 04:11:38 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 29F52BB9403; Sun, 14 Aug 2016 04:11:38 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EAE891DF9; Sun, 14 Aug 2016 04:11:37 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7E4BbX3014022; Sun, 14 Aug 2016 04:11:37 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7E4BbtY014021; Sun, 14 Aug 2016 04:11:37 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201608140411.u7E4BbtY014021@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Sun, 14 Aug 2016 04:11:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r304069 - head/sys/powerpc/mpc85xx X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Aug 2016 04:11:38 -0000 Author: jhibbits Date: Sun Aug 14 04:11:36 2016 New Revision: 304069 URL: https://svnweb.freebsd.org/changeset/base/304069 Log: Return 0 instead of an error code on failure to find dcsr. mpc85xx_map_dcsr() returns a vm_offset_t, not an error code. mpc85xx_fix_errata() will gracefully exit if mpc85xx_map_dcsr() returns 0, as that indicates an error (NULL pointer). Modified: head/sys/powerpc/mpc85xx/mpc85xx.c Modified: head/sys/powerpc/mpc85xx/mpc85xx.c ============================================================================== --- head/sys/powerpc/mpc85xx/mpc85xx.c Sun Aug 14 03:49:37 2016 (r304068) +++ head/sys/powerpc/mpc85xx/mpc85xx.c Sun Aug 14 04:11:36 2016 (r304069) @@ -358,10 +358,10 @@ mpc85xx_map_dcsr(void) * Find the node the long way. */ if ((node = OF_finddevice("/")) == -1) - return (ENXIO); + return (0); if ((node = ofw_bus_find_compatible(node, "fsl,dcsr")) == 0) - return (ENXIO); + return (0); moveon: err = fdt_get_range(node, 0, &b, &s);