Messages in this thread | | | Date | Mon, 5 Feb 2024 15:13:38 +0900 | From | Takashi Sakamoto <> | Subject | Re: [PATCH] firewire: core: fix build failure due to the caller of fw_csr_string() |
| |
Hi,
On Mon, Feb 05, 2024 at 03:04:48PM +0900, Takashi Sakamoto wrote: > A commit 47dc55181dcb ("firewire: core: search descriptor leaf just after > vendor directory entry in root directory") for v6.8-rc3 and a commit > 67a5a58c0443 ("firewire: Kill unnecessary buf check in > device_attribute.show") for v6.9 bring build failure in for-next tree due > to the change of the name of local variable. > > This commit fixes it. > > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> > Closes: https://lore.kernel.org/lkml/20240202111602.6f6e2c1a@canb.auug.org.au/ > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202402022343.NkgsMITA-lkp@intel.com/ > Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> > --- > drivers/firewire/core-device.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c > index a802c6d4f4fd..c0976f6268d3 100644 > --- a/drivers/firewire/core-device.c > +++ b/drivers/firewire/core-device.c > @@ -366,7 +366,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, > - bufsize); > + PAGE_SIZE - 1); > if (result >= 0) > ret = result; > } > -- > 2.40.1
I applied this immediately to fix linux-next integration.
Regards
Takashi Sakamoto
| |