| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Fri, 27 Jan 2017 13:32:14 +0100 |
| Subject: ISDN: eicon: silence misleading array-bounds warning |
| |
| commit 950eabbd6ddedc1b08350b9169a6a51b130ebaaf upstream. |
| |
| With some gcc versions, we get a warning about the eicon driver, |
| and that currently shows up as the only remaining warning in one |
| of the build bots: |
| |
| In file included from ../drivers/isdn/hardware/eicon/message.c:30:0: |
| eicon/message.c: In function 'mixer_notify_update': |
| eicon/platform.h:333:18: warning: array subscript is above array bounds [-Warray-bounds] |
| |
| The code is easily changed to open-code the unusual PUT_WORD() line |
| causing this to avoid the warning. |
| |
| Link: http://arm-soc.lixom.net/buildlogs/stable-rc/v4.4.45/ |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/isdn/hardware/eicon/message.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/isdn/hardware/eicon/message.c |
| +++ b/drivers/isdn/hardware/eicon/message.c |
| @@ -11304,7 +11304,8 @@ static void mixer_notify_update(PLCI *pl |
| ((CAPI_MSG *) msg)->header.ncci = 0; |
| ((CAPI_MSG *) msg)->info.facility_req.Selector = SELECTOR_LINE_INTERCONNECT; |
| ((CAPI_MSG *) msg)->info.facility_req.structs[0] = 3; |
| - PUT_WORD(&(((CAPI_MSG *) msg)->info.facility_req.structs[1]), LI_REQ_SILENT_UPDATE); |
| + ((CAPI_MSG *) msg)->info.facility_req.structs[1] = LI_REQ_SILENT_UPDATE & 0xff; |
| + ((CAPI_MSG *) msg)->info.facility_req.structs[2] = LI_REQ_SILENT_UPDATE >> 8; |
| ((CAPI_MSG *) msg)->info.facility_req.structs[3] = 0; |
| w = api_put(notify_plci->appl, (CAPI_MSG *) msg); |
| if (w != _QUEUE_FULL) |
