PERFORCE change 50849 for review

[Scott Long]

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

Change 50849 by scottl at 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);
 	}