lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2009-09-05 14:59:00 -07:00
parent 74a01180db baed6b82d9
commit f815c335d2
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/firewire/sbp2.c
View File

@@ -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);
}