patch-2.3.1 linux/drivers/block/swim3.c

Next file: linux/drivers/block/trm290.c
Previous file: linux/drivers/block/sl82c105.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.0/linux/drivers/block/swim3.c linux/drivers/block/swim3.c
@@ -193,7 +193,7 @@
 	struct timer_list timeout;
 	int	timeout_pending;
 	int	ejected;
-	struct wait_queue *wait;
+	wait_queue_head_t wait;
 	int	wanted;
 	struct device_node*	media_bay; /* NULL when not in bay */
 	char	dbdma_cmd_space[5 * sizeof(struct dbdma_cmd)];
@@ -1132,6 +1132,7 @@
 	fs->secpertrack = 18;
 	fs->total_secs = 2880;
 	fs->media_bay = mediabay;
+	init_waitqueue_head(&fs->wait);
 
 	fs->dma_cmd = (struct dbdma_cmd *) DBDMA_ALIGN(fs->dbdma_cmd_space);
 	memset(fs->dma_cmd, 0, 2 * sizeof(struct dbdma_cmd));

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)