diff --git a/[refs] b/[refs] index c19fe2403848..a0a0e0eb00b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45145f9ab143727335477570b436c464880714c8 +refs/heads/master: 03bbb232d6cd7083daedf0915ffb6cac26870e67 diff --git a/trunk/drivers/staging/sbe-2t3e3/netdev.c b/trunk/drivers/staging/sbe-2t3e3/netdev.c index c7b5e8bb04ff..b339c7731bf8 100644 --- a/trunk/drivers/staging/sbe-2t3e3/netdev.c +++ b/trunk/drivers/staging/sbe-2t3e3/netdev.c @@ -27,7 +27,7 @@ int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) int cmd_2t3e3, len, rlen; t3e3_param_t param; t3e3_resp_t resp; - void *data = ifr->ifr_data + sizeof(cmd_2t3e3) + sizeof(len); + void __user *data = ifr->ifr_data + sizeof(cmd_2t3e3) + sizeof(len); if (cmd == SIOCWANDEV) return hdlc_ioctl(dev, ifr, cmd);