From owner-svn-src-head@FreeBSD.ORG  Sat Jun 13 22:29:43 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EC6F4249;
 Sat, 13 Jun 2015 22:29:43 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
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 DA835F3F;
 Sat, 13 Jun 2015 22:29:43 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5DMThIg037331;
 Sat, 13 Jun 2015 22:29:43 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5DMThgn037330;
 Sat, 13 Jun 2015 22:29:43 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201506132229.t5DMThgn037330@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sat, 13 Jun 2015 22:29:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284358 - head/sys/dev/acpi_support
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2015 22:29:44 -0000

Author: ngie
Date: Sat Jun 13 22:29:43 2015
New Revision: 284358
URL: https://svnweb.freebsd.org/changeset/base/284358

Log:
  Fix previous commit (r284357)
  
  I forgot to convert the && to a ||
  
  Pointyhat to: ngie
  X-MFC with: r283678, r284336, r284357

Modified:
  head/sys/dev/acpi_support/acpi_ibm.c

Modified: head/sys/dev/acpi_support/acpi_ibm.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_ibm.c	Sat Jun 13 22:27:59 2015	(r284357)
+++ head/sys/dev/acpi_support/acpi_ibm.c	Sat Jun 13 22:29:43 2015	(r284358)
@@ -485,7 +485,7 @@ acpi_ibm_attach(device_t dev)
 	/* Enable per-model events. */
 	maker = kern_getenv("smbios.system.maker");
 	product = kern_getenv("smbios.system.product");
-	if (maker == NULL && product == NULL)
+	if (maker == NULL || product == NULL)
 		goto nosmbios;
 
 	for (i = 0; i < nitems(acpi_ibm_models); i++) {