Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 186fd777a8c63c28acdbcb0e9aefa7ebc858641e

Authored by Frank Lichtenheld
Committed by David S. Miller
1 parent e1cd8f78f8
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[ISDN] sc: Fix sndpkt to have the correct number of arguments 

isdn_if.writebuf_skb has an additional ack flag argument which
was missing from sndpkt leading to the following warning:
  CC [M]  drivers/isdn/sc/init.o
drivers/isdn/sc/init.c: In function ‘sc_init’:
drivers/isdn/sc/init.c:281: warning: assignment from incompatible pointer type

Note that this doesn't actually do anything with the flag, it
just fixes the warning (and probably accessing the last argument).

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

drivers/isdn/sc/card.h
Diff comments   View file @ 186fd77
... ... @@ -109,7 +109,7 @@
109 109 int get_card_from_id(int driver);
110 110 int indicate_status(int card, int event, ulong Channel, char *Data);
111 111 irqreturn_t interrupt_handler(int interrupt, void *cardptr);
112   -int sndpkt(int devId, int channel, struct sk_buff *data);
  112 +int sndpkt(int devId, int channel, int ack, struct sk_buff *data);
113 113 void rcvpkt(int card, RspMessage *rcvmsg);
114 114 int command(isdn_ctrl *cmd);
115 115 int reset(int card);
drivers/isdn/sc/packet.c
Diff comments   View file @ 186fd77
... ... @@ -20,7 +20,7 @@
20 20 #include "message.h"
21 21 #include "card.h"
22 22  
23   -int sndpkt(int devId, int channel, struct sk_buff *data)
  23 +int sndpkt(int devId, int channel, int ack, struct sk_buff *data)
24 24 {
25 25 LLData ReqLnkWrite;
26 26 int status;