Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
Linus Torvalds committed May 1, 2008
2 parents 6ed7b6a + f32ddad commit 886c35f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/firewire/fw-sbp2.c
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ static void sbp2_release_target(struct kref *kref)
kfree(lu);
}
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);
scsi_host_put(shost);
Expand Down
5 changes: 4 additions & 1 deletion drivers/ieee1394/nodemgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -520,8 +520,11 @@ static ssize_t fw_show_drv_device_ids(struct device_driver *drv, char *buf)
char *scratch = buf;

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;

if (id->match_flags & IEEE1394_MATCH_VENDOR_ID) {
Expand Down

0 comments on commit 886c35f

Please sign in to comment.