Hi, (you need to break your lines at 80 characters) Corentin LABBE <clabbe.montjoie@xxxxxxxxx> writes: > Le 16/11/2015 18:07, Felipe Balbi a écrit : >> >> Hi, >> >> LABBE Corentin <clabbe.montjoie@xxxxxxxxx> writes: >>> of_match_device could return NULL, and so cause a NULL pointer >>> dereference later. Renaming id to of_id (like all others do) in the >>> process. >>> >>> Reported-by: coverity (CID 1324133) >>> Signed-off-by: LABBE Corentin <clabbe.montjoie@xxxxxxxxx> >>> --- >>> drivers/usb/phy/phy-msm-usb.c | 9 ++++++--- >>> 1 file changed, 6 insertions(+), 3 deletions(-) >>> >>> diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c >>> index 80eb991..c4a66cf 100644 >>> --- a/drivers/usb/phy/phy-msm-usb.c >>> +++ b/drivers/usb/phy/phy-msm-usb.c >>> @@ -1506,20 +1506,23 @@ static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg) >>> { >>> struct msm_otg_platform_data *pdata; >>> struct extcon_dev *ext_id, *ext_vbus; >>> - const struct of_device_id *id; >>> + const struct of_device_id *of_id; >> >> and why did you need to rename this variable ? Please resend without the >> variable rename. >> > > I was renaming because all other drivers call it of_id, but I got hint > from another thread to use of_device_get_match_data() which will > permit to remove that variable, and still solve the issue. for -rc we usually want the smallest patch needed to fix the issue. That would be the two line if() condition. If converting to of_device_get_match_data() is about the same (2 or 3 lines), then it should be fine; but as a general rule of thumb: we don't fix and cleanup/refactor on the same patch unless strictly necessary. -- balbi
Attachment:
signature.asc
Description: PGP signature