tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: fw-sbp2: log scsi_target ID at release
ieee1394: fix NULL pointer dereference in sysfs access

Linus Torvalds 886c35fb 6ed7b6a0

+5 -2
+1 -1
drivers/firewire/fw-sbp2.c
··· 784 784 kfree(lu); 785 785 } 786 786 scsi_remove_host(shost); 787 - fw_notify("released %s\n", tgt->bus_id); 787 + fw_notify("released %s, target %d:0:0\n", tgt->bus_id, shost->host_no); 788 788 789 789 fw_unit_put(tgt->unit); 790 790 scsi_host_put(shost);
+4 -1
drivers/ieee1394/nodemgr.c
··· 520 520 char *scratch = buf; 521 521 522 522 driver = container_of(drv, struct hpsb_protocol_driver, driver); 523 + id = driver->id_table; 524 + if (!id) 525 + return 0; 523 526 524 - for (id = driver->id_table; id->match_flags != 0; id++) { 527 + for (; id->match_flags != 0; id++) { 525 528 int need_coma = 0; 526 529 527 530 if (id->match_flags & IEEE1394_MATCH_VENDOR_ID) {