From 05cdc72193d1770f62e2737c0facc4b67cd4e5ad Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Sun, 23 Mar 2008 10:15:28 -0400 Subject: [PATCH] --- yaml --- r: 89611 b: refs/heads/master c: e351c4d069254b1267b66a3b101ece7547178485 h: refs/heads/master i: 89609: 7750819dd8982fcc53e02c8c9e56ba8452acc7e9 89607: fd2f86ba2ef758bdf4534fc25607defff1b5f08b v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/ohci1394.c | 6 ++---- trunk/drivers/ieee1394/pcilynx.c | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index cac2c4113822..b58d7f804382 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1ce1fd778997b3313599a2561bcbd42a34bfb56 +refs/heads/master: e351c4d069254b1267b66a3b101ece7547178485 diff --git a/trunk/drivers/ieee1394/ohci1394.c b/trunk/drivers/ieee1394/ohci1394.c index 0808baea7390..4665a6fb07d8 100644 --- a/trunk/drivers/ieee1394/ohci1394.c +++ b/trunk/drivers/ieee1394/ohci1394.c @@ -2089,10 +2089,8 @@ static void dma_trm_reset(struct dma_trm_ctx *d) spin_lock_irqsave(&d->lock, flags); - list_splice(&d->fifo_list, &packet_list); - list_splice(&d->pending_list, &packet_list); - INIT_LIST_HEAD(&d->fifo_list); - INIT_LIST_HEAD(&d->pending_list); + list_splice_init(&d->fifo_list, &packet_list); + list_splice_init(&d->pending_list, &packet_list); d->branchAddrPtr = NULL; d->sent_ind = d->prg_ind; diff --git a/trunk/drivers/ieee1394/pcilynx.c b/trunk/drivers/ieee1394/pcilynx.c index 9c35e0d498cb..7aee1ac97c80 100644 --- a/trunk/drivers/ieee1394/pcilynx.c +++ b/trunk/drivers/ieee1394/pcilynx.c @@ -738,8 +738,7 @@ static int lynx_devctl(struct hpsb_host *host, enum devctl_cmd cmd, int arg) spin_lock_irqsave(&lynx->async.queue_lock, flags); reg_write(lynx, DMA_CHAN_CTRL(CHANNEL_ASYNC_SEND), 0); - list_splice(&lynx->async.queue, &packet_list); - INIT_LIST_HEAD(&lynx->async.queue); + list_splice_init(&lynx->async.queue, &packet_list); if (list_empty(&lynx->async.pcl_queue)) { spin_unlock_irqrestore(&lynx->async.queue_lock, flags);