From owner-p4-projects@FreeBSD.ORG  Sun Apr 11 09:28:14 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DB71616A4D0; Sun, 11 Apr 2004 09:28:13 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B4E7E16A4CE
	for <perforce@freebsd.org>; Sun, 11 Apr 2004 09:28:13 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B0B4643D39
	for <perforce@freebsd.org>; Sun, 11 Apr 2004 09:28:13 -0700 (PDT)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3BGSDGe024890
	for <perforce@freebsd.org>; Sun, 11 Apr 2004 09:28:13 -0700 (PDT)
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3BGSDba024887
	for perforce@freebsd.org; Sun, 11 Apr 2004 09:28:13 -0700 (PDT)
	(envelope-from scottl@freebsd.org)
Date: Sun, 11 Apr 2004 09:28:13 -0700 (PDT)
Message-Id: <200404111628.i3BGSDba024887@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 50849 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Apr 2004 16:28:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=50849

Change 50849 by scottl@scottl-junior-camlock on 2004/04/11 09:28:05

	work_links -> work_link to follow convention.
	Fix a typo in a printf.
	
	Submitted by: kan

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_probe.c#6 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_probe.c#6 (text+ko) ====

@@ -86,7 +86,7 @@
 } cam_workflags;
 
 struct cam_workitem {
-	TAILQ_ENTRY(cam_workitem)	work_links;
+	TAILQ_ENTRY(cam_workitem)	work_link;
 	cam_workflags			command;
 	void				*data1;
 	uintptr_t			data2;
@@ -129,7 +129,7 @@
 probe_queue_work(struct cam_workitem *work)
 {
 	mtx_lock(&probe_workmtx);
-	TAILQ_INSERT_TAIL(&probe_worklist, work, work_links);
+	TAILQ_INSERT_TAIL(&probe_worklist, work, work_link);
 	mtx_unlock(&probe_workmtx);
 	wakeup(&probe_worklist);
 }
@@ -159,7 +159,7 @@
 			       "probew", 0);
 			continue;
 		}
-		TAILQ_REMOVE(&probe_worklist, work, work_links);
+		TAILQ_REMOVE(&probe_worklist, work, work_link);
 		mtx_unlock(&probe_workmtx);
 
 		switch (work->command) {
@@ -228,8 +228,8 @@
 	work = malloc(sizeof(struct cam_workitem), M_TEMP, M_NOWAIT | M_ZERO);
 	if (work == NULL) {
 		printf("proberegister: Unable to probe new device. "
-		       "Unable to allocate softc\n");
-		free(softc, M_TEMP);
+		       "Unable to allocate workitem\n");
+		free(work, M_TEMP);
 		return (CAM_REQ_CMP_ERR);
 	}