diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 14:59:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 14:59:00 -0700 |
| commit | f815c335d21f9965f8dbe142fd168aaba1baf98e (patch) | |
| tree | 4e9a65b7810de10141595125cc65f2b0e7533dfc /drivers/firewire/sbp2.c | |
| parent | powerpc: Fix i8259 interrupt driver kernel crash on ML510 (diff) | |
| parent | firewire: sbp2: fix freeing of unallocated memory (diff) | |
| download | linux-dev-f815c335d21f9965f8dbe142fd168aaba1baf98e.tar.xz linux-dev-f815c335d21f9965f8dbe142fd168aaba1baf98e.zip | |
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: sbp2: fix freeing of unallocated memory
firewire: ohci: fix Ricoh R5C832, video reception
firewire: ohci: fix Agere FW643 and multiple cameras
firewire: core: fix crash in iso resource management
Diffstat (limited to 'drivers/firewire/sbp2.c')
| -rw-r--r-- | drivers/firewire/sbp2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c index 8d51568ee143..e5df822a8130 100644 --- a/drivers/firewire/sbp2.c +++ b/drivers/firewire/sbp2.c @@ -456,12 +456,12 @@ static void sbp2_status_write(struct fw_card *card, struct fw_request *request, } spin_unlock_irqrestore(&card->lock, flags); - if (&orb->link != &lu->orb_list) + if (&orb->link != &lu->orb_list) { orb->callback(orb, &status); - else + kref_put(&orb->kref, free_orb); + } else { fw_error("status write for unknown orb\n"); - - kref_put(&orb->kref, free_orb); + } fw_send_response(card, request, RCODE_COMPLETE); } |