diff options
Diffstat (limited to 'drivers/ieee1394')
-rw-r--r-- | drivers/ieee1394/ohci1394.c | 6 | ||||
-rw-r--r-- | drivers/ieee1394/pcilynx.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 0808baea7390..4665a6fb07d8 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c | |||
@@ -2089,10 +2089,8 @@ static void dma_trm_reset(struct dma_trm_ctx *d) | |||
2089 | 2089 | ||
2090 | spin_lock_irqsave(&d->lock, flags); | 2090 | spin_lock_irqsave(&d->lock, flags); |
2091 | 2091 | ||
2092 | list_splice(&d->fifo_list, &packet_list); | 2092 | list_splice_init(&d->fifo_list, &packet_list); |
2093 | list_splice(&d->pending_list, &packet_list); | 2093 | list_splice_init(&d->pending_list, &packet_list); |
2094 | INIT_LIST_HEAD(&d->fifo_list); | ||
2095 | INIT_LIST_HEAD(&d->pending_list); | ||
2096 | 2094 | ||
2097 | d->branchAddrPtr = NULL; | 2095 | d->branchAddrPtr = NULL; |
2098 | d->sent_ind = d->prg_ind; | 2096 | d->sent_ind = d->prg_ind; |
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c index 9c35e0d498cb..7aee1ac97c80 100644 --- a/drivers/ieee1394/pcilynx.c +++ b/drivers/ieee1394/pcilynx.c | |||
@@ -738,8 +738,7 @@ static int lynx_devctl(struct hpsb_host *host, enum devctl_cmd cmd, int arg) | |||
738 | spin_lock_irqsave(&lynx->async.queue_lock, flags); | 738 | spin_lock_irqsave(&lynx->async.queue_lock, flags); |
739 | 739 | ||
740 | reg_write(lynx, DMA_CHAN_CTRL(CHANNEL_ASYNC_SEND), 0); | 740 | reg_write(lynx, DMA_CHAN_CTRL(CHANNEL_ASYNC_SEND), 0); |
741 | list_splice(&lynx->async.queue, &packet_list); | 741 | list_splice_init(&lynx->async.queue, &packet_list); |
742 | INIT_LIST_HEAD(&lynx->async.queue); | ||
743 | 742 | ||
744 | if (list_empty(&lynx->async.pcl_queue)) { | 743 | if (list_empty(&lynx->async.pcl_queue)) { |
745 | spin_unlock_irqrestore(&lynx->async.queue_lock, flags); | 744 | spin_unlock_irqrestore(&lynx->async.queue_lock, flags); |