| From 0d962e061abcf1b9105f88fb850158b5887fbca3 Mon Sep 17 00:00:00 2001 |
| From: "Gustavo A. R. Silva" <gustavo@embeddedor.com> |
| Date: Tue, 22 Oct 2019 15:25:22 +0200 |
| Subject: media: i2c: adv748x: Fix unsafe macros |
| |
| From: Gustavo A. R. Silva <gustavo@embeddedor.com> |
| |
| commit 0d962e061abcf1b9105f88fb850158b5887fbca3 upstream. |
| |
| Enclose multiple macro parameters in parentheses in order to |
| make such macros safer and fix the Clang warning below: |
| |
| drivers/media/i2c/adv748x/adv748x-afe.c:452:12: warning: operator '?:' |
| has lower precedence than '|'; '|' will be evaluated first |
| [-Wbitwise-conditional-parentheses] |
| |
| ret = sdp_clrset(state, ADV748X_SDP_FRP, ADV748X_SDP_FRP_MASK, enable |
| ? ctrl->val - 1 : 0); |
| |
| Fixes: 3e89586a64df ("media: i2c: adv748x: add adv748x driver") |
| Reported-by: Dmitry Vyukov <dvyukov@google.com> |
| Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> |
| Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/media/i2c/adv748x/adv748x.h | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/media/i2c/adv748x/adv748x.h |
| +++ b/drivers/media/i2c/adv748x/adv748x.h |
| @@ -394,10 +394,10 @@ int adv748x_write_block(struct adv748x_s |
| |
| #define io_read(s, r) adv748x_read(s, ADV748X_PAGE_IO, r) |
| #define io_write(s, r, v) adv748x_write(s, ADV748X_PAGE_IO, r, v) |
| -#define io_clrset(s, r, m, v) io_write(s, r, (io_read(s, r) & ~m) | v) |
| +#define io_clrset(s, r, m, v) io_write(s, r, (io_read(s, r) & ~(m)) | (v)) |
| |
| #define hdmi_read(s, r) adv748x_read(s, ADV748X_PAGE_HDMI, r) |
| -#define hdmi_read16(s, r, m) (((hdmi_read(s, r) << 8) | hdmi_read(s, r+1)) & m) |
| +#define hdmi_read16(s, r, m) (((hdmi_read(s, r) << 8) | hdmi_read(s, (r)+1)) & (m)) |
| #define hdmi_write(s, r, v) adv748x_write(s, ADV748X_PAGE_HDMI, r, v) |
| |
| #define repeater_read(s, r) adv748x_read(s, ADV748X_PAGE_REPEATER, r) |
| @@ -405,11 +405,11 @@ int adv748x_write_block(struct adv748x_s |
| |
| #define sdp_read(s, r) adv748x_read(s, ADV748X_PAGE_SDP, r) |
| #define sdp_write(s, r, v) adv748x_write(s, ADV748X_PAGE_SDP, r, v) |
| -#define sdp_clrset(s, r, m, v) sdp_write(s, r, (sdp_read(s, r) & ~m) | v) |
| +#define sdp_clrset(s, r, m, v) sdp_write(s, r, (sdp_read(s, r) & ~(m)) | (v)) |
| |
| #define cp_read(s, r) adv748x_read(s, ADV748X_PAGE_CP, r) |
| #define cp_write(s, r, v) adv748x_write(s, ADV748X_PAGE_CP, r, v) |
| -#define cp_clrset(s, r, m, v) cp_write(s, r, (cp_read(s, r) & ~m) | v) |
| +#define cp_clrset(s, r, m, v) cp_write(s, r, (cp_read(s, r) & ~(m)) | (v)) |
| |
| #define tx_read(t, r) adv748x_read(t->state, t->page, r) |
| #define tx_write(t, r, v) adv748x_write(t->state, t->page, r, v) |
