summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2009-10-06 10:39:51 +0200
committerDavid S. Miller <davem@davemloft.net>2009-10-06 10:39:51 +0200
commitf0b25932b8e60e96f5f371b27442e560803ac6f5 (patch)
treec04e8d202b88f79ac86b603cd135af26fee62dd4 /drivers
parentwext: let get_wireless_stats() sleep (diff)
downloadlinux-f0b25932b8e60e96f5f371b27442e560803ac6f5.tar.xz
linux-f0b25932b8e60e96f5f371b27442e560803ac6f5.zip
connector: Fix incompatible pointer type warning
Commit 7069331 (connector: Provide the sender's credentials to the callback, 2009-10-02) changed callbacks to take two arguments but missed this one. drivers/connector/cn_proc.c: In function ‘cn_proc_init’: drivers/connector/cn_proc.c:263: warning: passing argument 3 of ‘cn_add_callback’ from incompatible pointer type Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/connector/cn_proc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index abf4a2529f80..60697909ebdb 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -227,7 +227,8 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)
* cn_proc_mcast_ctl
* @data: message sent from userspace via the connector
*/
-static void cn_proc_mcast_ctl(struct cn_msg *msg)
+static void cn_proc_mcast_ctl(struct cn_msg *msg,
+ struct netlink_skb_parms *nsp)
{
enum proc_cn_mcast_op *mc_op = NULL;
int err = 0;