| Message ID | 1662445382-29879-1-git-send-email-vincent.sunplus@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | phy: usb: free the buffer after reading a given nvmem cell | expand |
On Tue, Sep 06, 2022 at 02:23:02PM +0800, Vincent Shih wrote: > Use kfree() to free the buffer after calling nvmem_cell_read() to > read a given nvmem cell. > > Fixes:99d9ccd97385("phy: usb: Add USB2.0 phy driver for Sunplus SP7021") This is not a commit in Linus's tree, are you sure it is right? And the format is not quite correct, you need some spaces in the line. > Signed-off-by: Vincent Shih <vincent.sunplus@gmail.com> > --- > drivers/phy/sunplus/phy-sunplus-usb2.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/phy/sunplus/phy-sunplus-usb2.c b/drivers/phy/sunplus/phy-sunplus-usb2.c > index 5269968..c8540e1 100644 > --- a/drivers/phy/sunplus/phy-sunplus-usb2.c > +++ b/drivers/phy/sunplus/phy-sunplus-usb2.c > @@ -13,6 +13,7 @@ > #include <linux/bitfield.h> > #include <linux/clk.h> > #include <linux/delay.h> > +#include <linux/err.h> > #include <linux/io.h> > #include <linux/module.h> > #include <linux/nvmem-consumer.h> > @@ -92,13 +93,15 @@ static int update_disc_vol(struct sp_usbphy *usbphy) > otp_v = nvmem_cell_read(cell, &otp_l); > nvmem_cell_put(cell); > > - if (otp_v) { > + if (!IS_ERR(otp_v)) { > set = *(otp_v + 1); > set = (set << (sizeof(char) * 8)) | *otp_v; > set = (set >> usbphy->disc_vol_addr_off) & J_DISC; > + > + kfree(otp_v); > } > - > - if (!otp_v || set == 0) > + > + if (IS_ERR(otp_v) || (set == 0)) > set = OTP_DISC_LEVEL_DEFAULT; > > val = readl(usbphy->phy_regs + CONFIG7); > @@ -294,3 +297,4 @@ module_platform_driver(sunplus_usb_phy_driver); > MODULE_AUTHOR("Vincent Shih <vincent.shih@sunplus.com>"); > MODULE_DESCRIPTION("Sunplus USB 2.0 phy driver"); > MODULE_LICENSE("GPL"); > + Why the extra blank line? thanks, greg k-h
Hello! On 9/6/22 9:23 AM, Vincent Shih wrote: > Use kfree() to free the buffer after calling nvmem_cell_read() to > read a given nvmem cell. Your patch does more than just that. It looks like we need 2 patches here... > Fixes:99d9ccd97385("phy: usb: Add USB2.0 phy driver for Sunplus SP7021") Need spaces after : and before (. > Signed-off-by: Vincent Shih <vincent.sunplus@gmail.com> > --- > drivers/phy/sunplus/phy-sunplus-usb2.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/phy/sunplus/phy-sunplus-usb2.c b/drivers/phy/sunplus/phy-sunplus-usb2.c > index 5269968..c8540e1 100644 > --- a/drivers/phy/sunplus/phy-sunplus-usb2.c > +++ b/drivers/phy/sunplus/phy-sunplus-usb2.c [...] > @@ -92,13 +93,15 @@ static int update_disc_vol(struct sp_usbphy *usbphy) > otp_v = nvmem_cell_read(cell, &otp_l); > nvmem_cell_put(cell); > > - if (otp_v) { > + if (!IS_ERR(otp_v)) { This needs a separate patch, I think... > set = *(otp_v + 1); > set = (set << (sizeof(char) * 8)) | *otp_v; > set = (set >> usbphy->disc_vol_addr_off) & J_DISC; > + > + kfree(otp_v); > } > - > - if (!otp_v || set == 0) > + > + if (IS_ERR(otp_v) || (set == 0)) > set = OTP_DISC_LEVEL_DEFAULT; > > val = readl(usbphy->phy_regs + CONFIG7); > @@ -294,3 +297,4 @@ module_platform_driver(sunplus_usb_phy_driver); > MODULE_AUTHOR("Vincent Shih <vincent.shih@sunplus.com>"); > MODULE_DESCRIPTION("Sunplus USB 2.0 phy driver"); > MODULE_LICENSE("GPL"); > + Huh? :-) MBR, Sergey
diff --git a/drivers/phy/sunplus/phy-sunplus-usb2.c b/drivers/phy/sunplus/phy-sunplus-usb2.c index 5269968..c8540e1 100644 --- a/drivers/phy/sunplus/phy-sunplus-usb2.c +++ b/drivers/phy/sunplus/phy-sunplus-usb2.c @@ -13,6 +13,7 @@ #include <linux/bitfield.h> #include <linux/clk.h> #include <linux/delay.h> +#include <linux/err.h> #include <linux/io.h> #include <linux/module.h> #include <linux/nvmem-consumer.h> @@ -92,13 +93,15 @@ static int update_disc_vol(struct sp_usbphy *usbphy) otp_v = nvmem_cell_read(cell, &otp_l); nvmem_cell_put(cell); - if (otp_v) { + if (!IS_ERR(otp_v)) { set = *(otp_v + 1); set = (set << (sizeof(char) * 8)) | *otp_v; set = (set >> usbphy->disc_vol_addr_off) & J_DISC; + + kfree(otp_v); } - - if (!otp_v || set == 0) + + if (IS_ERR(otp_v) || (set == 0)) set = OTP_DISC_LEVEL_DEFAULT; val = readl(usbphy->phy_regs + CONFIG7); @@ -294,3 +297,4 @@ module_platform_driver(sunplus_usb_phy_driver); MODULE_AUTHOR("Vincent Shih <vincent.shih@sunplus.com>"); MODULE_DESCRIPTION("Sunplus USB 2.0 phy driver"); MODULE_LICENSE("GPL"); +
Use kfree() to free the buffer after calling nvmem_cell_read() to read a given nvmem cell. Fixes:99d9ccd97385("phy: usb: Add USB2.0 phy driver for Sunplus SP7021") Signed-off-by: Vincent Shih <vincent.sunplus@gmail.com> --- drivers/phy/sunplus/phy-sunplus-usb2.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)