Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 886c35fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6ed7b6a0 f32ddadd

drivers/firewire/fw-sbp2.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/ieee1394/nodemgr.c

+4 −1
Original line number Diff line number Diff line
@@ -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) {