diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-01 11:31:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-01 11:31:38 -0700 |
| commit | 886c35fbcf6fb2eee15687efc2d64d99b6ad9a4a (patch) | |
| tree | e5e928b5197c078af184a65fd36d8428f5433683 | |
| parent | 6ed7b6a05dc4332c391134809387220123e82ea7 (diff) | |
| parent | f32ddaddf95d8a30be5a41cf681bc8792bc42ec7 (diff) | |
| download | op-kernel-dev-886c35fbcf6fb2eee15687efc2d64d99b6ad9a4a.zip op-kernel-dev-886c35fbcf6fb2eee15687efc2d64d99b6ad9a4a.tar.gz | |
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
| -rw-r--r-- | drivers/firewire/fw-sbp2.c | 2 | ||||
| -rw-r--r-- | drivers/ieee1394/nodemgr.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c index 2a999373..62e3c91 100644 --- a/drivers/firewire/fw-sbp2.c +++ b/drivers/firewire/fw-sbp2.c @@ -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); diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 29d833e..05710c7 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c @@ -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) { |
