aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2006-09-17 12:17:19 -0400
committerStefan Richter <stefanr@s5r6.in-berlin.de>2006-09-17 12:19:31 -0400
commit9b4f2e9576658c4e52d95dc8d309f51b2e2db096 (patch)
tree7b1902b0f931783fccc6fee45c6f9c16b4fde5ce /drivers/ieee1394
parent3c6c65f5ed5a6d307bd607aecd06d658c0934d88 (diff)
parent803db244b9f71102e366fd689000c1417b9a7508 (diff)
ieee1394: merge from Linus
Conflicts: drivers/ieee1394/hosts.c Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling with patch "ieee1394: fix kerneldoc of hpsb_alloc_host". Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394')
-rw-r--r--drivers/ieee1394/hosts.c10
-rw-r--r--drivers/ieee1394/ohci1394.c4
2 files changed, 12 insertions, 2 deletions
diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c
index 3ed56be8706c..59e6f49545bf 100644
--- a/drivers/ieee1394/hosts.c
+++ b/drivers/ieee1394/hosts.c
@@ -90,6 +90,14 @@ static int alloc_hostnum_cb(struct hpsb_host *host, void *__data)
90 return 0; 90 return 0;
91} 91}
92 92
93/*
94 * The pending_packet_queue is special in that it's processed
95 * from hardirq context too (such as hpsb_bus_reset()). Hence
96 * split the lock class from the usual networking skb-head
97 * lock class by using a separate key for it:
98 */
99static struct lock_class_key pending_packet_queue_key;
100
93static DEFINE_MUTEX(host_num_alloc); 101static DEFINE_MUTEX(host_num_alloc);
94 102
95/** 103/**
@@ -128,6 +136,8 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
128 h->driver = drv; 136 h->driver = drv;
129 137
130 skb_queue_head_init(&h->pending_packet_queue); 138 skb_queue_head_init(&h->pending_packet_queue);
139 lockdep_set_class(&h->pending_packet_queue.lock,
140 &pending_packet_queue_key);
131 INIT_LIST_HEAD(&h->addr_space); 141 INIT_LIST_HEAD(&h->addr_space);
132 142
133 for (i = 2; i < 16; i++) 143 for (i = 2; i < 16; i++)
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 2283005e3035..baa090d08d20 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -3553,6 +3553,8 @@ static int ohci1394_pci_resume (struct pci_dev *pdev)
3553 3553
3554static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state) 3554static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)
3555{ 3555{
3556 pci_save_state(pdev);
3557
3556#ifdef CONFIG_PPC_PMAC 3558#ifdef CONFIG_PPC_PMAC
3557 if (machine_is(powermac)) { 3559 if (machine_is(powermac)) {
3558 struct device_node *of_node; 3560 struct device_node *of_node;
@@ -3564,8 +3566,6 @@ static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)
3564 } 3566 }
3565#endif 3567#endif
3566 3568
3567 pci_save_state(pdev);
3568
3569 return 0; 3569 return 0;
3570} 3570}
3571 3571