From owner-svn-src-all@FreeBSD.ORG Sat Jul 26 17:49:40 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A84B1999; Sat, 26 Jul 2014 17:49:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 94F0420A2; Sat, 26 Jul 2014 17:49:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6QHneoZ038914; Sat, 26 Jul 2014 17:49:40 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6QHnene038913; Sat, 26 Jul 2014 17:49:40 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201407261749.s6QHnene038913@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 26 Jul 2014 17:49:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r269131 - head/sys/dev/uart 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.18 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: Sat, 26 Jul 2014 17:49:40 -0000 Author: marcel Date: Sat Jul 26 17:49:40 2014 New Revision: 269131 URL: http://svnweb.freebsd.org/changeset/base/269131 Log: Do not fail the low-level device probe simply because the kernel doesn't have support for the Z8530. Embedded PowerPC platforms typically don't. Fail when the device class we actually need is not present. Obtained from: Juniper Networks, Inc. Modified: head/sys/dev/uart/uart_cpu_powerpc.c Modified: head/sys/dev/uart/uart_cpu_powerpc.c ============================================================================== --- head/sys/dev/uart/uart_cpu_powerpc.c Sat Jul 26 17:24:58 2014 (r269130) +++ head/sys/dev/uart/uart_cpu_powerpc.c Sat Jul 26 17:49:40 2014 (r269131) @@ -113,10 +113,6 @@ uart_cpu_getdev(int devtype, struct uart phandle_t input, opts, chosen; int error; - class = &uart_z8530_class; - if (class == NULL) - return (ENXIO); - opts = OF_finddevice("/options"); chosen = OF_finddevice("/chosen"); switch (devtype) { @@ -181,6 +177,9 @@ uart_cpu_getdev(int devtype, struct uart } else return (ENXIO); + if (class == NULL) + return (ENXIO); + error = OF_decode_addr(input, 0, &di->bas.bst, &di->bas.bsh); if (error) return (error);