Commit 88d92fb1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'firewire-fixes-6.9-rc1' of... 

Merge tag 'firewire-fixes-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

Pull firewire fixes Takashi Sakamoto:
 "The previous pull includes some regressions in some device attributes
  exposed to sysfs. They are fixed now"

* tag 'firewire-fixes-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: core: add memo about the caller of show functions for device attributes
  Revert "firewire: Kill unnecessary buf check in device_attribute.show"
parents 241590e5 bfb1ad3c

drivers/firewire/core-device.c

+14 −4
Original line number Diff line number Diff line
@@ -322,7 +322,8 @@ static ssize_t show_immediate(struct device *dev, 
	if (value < 0)

		return -ENOENT;



	return sysfs_emit(buf, "0x%06x\n", value);

	// Note that this function is also called by init_fw_attribute_group() with NULL pointer.

	return buf ? sysfs_emit(buf, "0x%06x\n", value) : 0;

}



#define IMMEDIATE_ATTR(name, key)				\
@@ -334,6 +335,8 @@ static ssize_t show_text_leaf(struct device *dev, 
	struct config_rom_attribute *attr =

		container_of(dattr, struct config_rom_attribute, attr);

	const u32 *directories[] = {NULL, NULL};

	size_t bufsize;

	char dummy_buf[2];

	int i, ret = -ENOENT;



	down_read(&fw_device_rwsem);
@@ -355,9 +358,16 @@ static ssize_t show_text_leaf(struct device *dev, 
		}

	}



	// Note that this function is also called by init_fw_attribute_group() with NULL pointer.

	if (buf) {

		bufsize = PAGE_SIZE - 1;

	} else {

		buf = dummy_buf;

		bufsize = 1;

	}



	for (i = 0; i < ARRAY_SIZE(directories) && !!directories[i]; ++i) {

		int result = fw_csr_string(directories[i], attr->key, buf,

					   PAGE_SIZE - 1);

		int result = fw_csr_string(directories[i], attr->key, buf, bufsize);

		// Detected.

		if (result >= 0) {

			ret = result;
@@ -366,7 +376,7 @@ static ssize_t show_text_leaf(struct device *dev, 
			// in the root directory follows to the directory entry for vendor ID

			// instead of the immediate value for vendor ID.

			result = fw_csr_string(directories[i], CSR_DIRECTORY | attr->key, buf,

					       PAGE_SIZE - 1);

					       bufsize);

			if (result >= 0)

				ret = result;

		}