diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-02 15:38:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-02 15:38:17 -0500 |
| commit | 038f2f725503b55ab76cfd2645915a85594710fe (patch) | |
| tree | dfed2103875ec09f4bb4e7031e6eb370f8095c58 /drivers/firewire/fw-topology.c | |
| parent | 8d07a67cface19ac07d7324f38bda7bbb06bbdb2 (diff) | |
| parent | 855c603d61ede7e2810217f15f0d574b4f29c891 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: fix crash in automatic module unloading
firewire: potentially invalid pointers used in fw_card_bm_work
firewire: fw-sbp2: better fix for NULL pointer dereference in scsi_remove_device
Diffstat (limited to 'drivers/firewire/fw-topology.c')
| -rw-r--r-- | drivers/firewire/fw-topology.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c index 172c1867e9aa..e47bb040197a 100644 --- a/drivers/firewire/fw-topology.c +++ b/drivers/firewire/fw-topology.c | |||
| @@ -383,6 +383,7 @@ void fw_destroy_nodes(struct fw_card *card) | |||
| 383 | card->color++; | 383 | card->color++; |
| 384 | if (card->local_node != NULL) | 384 | if (card->local_node != NULL) |
| 385 | for_each_fw_node(card, card->local_node, report_lost_node); | 385 | for_each_fw_node(card, card->local_node, report_lost_node); |
| 386 | card->local_node = NULL; | ||
| 386 | spin_unlock_irqrestore(&card->lock, flags); | 387 | spin_unlock_irqrestore(&card->lock, flags); |
| 387 | } | 388 | } |
| 388 | 389 | ||