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: fw-sbp2: log scsi_target ID at release
  ieee1394: fix NULL pointer dereference in sysfs access
This commit is contained in:
Linus Torvalds
2008-05-01 11:31:38 -07:00
parent 6ed7b6a05d f32ddaddf9
commit 886c35fbcf
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/firewire/fw-sbp2.c
View File

@@ -784,7 +784,7 @@ static void sbp2_release_target(struct kref *kref)
kfree(lu); kfree(lu);
} }
scsi_remove_host(shost); scsi_remove_host(shost);
fw_notify("released %s\n", tgt->bus_id); fw_notify("released %s, target %d:0:0\n", tgt->bus_id, shost->host_no);
fw_unit_put(tgt->unit); fw_unit_put(tgt->unit);
scsi_host_put(shost); scsi_host_put(shost);

5
drivers/ieee1394/nodemgr.c
View File

@@ -520,8 +520,11 @@ static ssize_t fw_show_drv_device_ids(struct device_driver *drv, char *buf)
char *scratch = buf; char *scratch = buf;
driver = container_of(drv, struct hpsb_protocol_driver, driver); driver = container_of(drv, struct hpsb_protocol_driver, driver);
id = driver->id_table;
if (!id)
return 0;
for (id = driver->id_table; id->match_flags != 0; id++) { for (; id->match_flags != 0; id++) {
int need_coma = 0; int need_coma = 0;
if (id->match_flags & IEEE1394_MATCH_VENDOR_ID) { if (id->match_flags & IEEE1394_MATCH_VENDOR_ID) {