From owner-cvs-src@FreeBSD.ORG Mon Aug 16 15:57:19 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 033AD16A4CE; Mon, 16 Aug 2004 15:57:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D87BA43D41; Mon, 16 Aug 2004 15:57:18 +0000 (GMT) (envelope-from imp@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7GFvIvp004921; Mon, 16 Aug 2004 15:57:18 GMT (envelope-from imp@repoman.freebsd.org) Received: (from imp@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7GFvIcL004920; Mon, 16 Aug 2004 15:57:18 GMT (envelope-from imp) Message-Id: <200408161557.i7GFvIcL004920@repoman.freebsd.org> From: Warner Losh Date: Mon, 16 Aug 2004 15:57:18 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/dev/pccard pccard.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2004 15:57:19 -0000 imp 2004-08-16 15:57:18 UTC FreeBSD src repository Modified files: sys/dev/pccard pccard.c Log: Some cards don't have the info entries in the CIS, so vendorstr and/or prodstr may be NULL when fetched. For the default device description, guard against this and return the numeric IDs instead when this happens. For the matching routines, and consider NULL to not match those entries that aren't NULL w/o calling strcmp. Early patches by: Anders Hanssen Revision Changes Path 1.93 +21 -7 src/sys/dev/pccard/pccard.c