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

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 29d833e71cbf..05710c7c1220 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) {