From 4162566b18f4c16d77ec56396fe1f85648f4a14f Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 4 Jun 2010 12:39:51 +0200 Subject: [PATCH] --- yaml --- r: 199883 b: refs/heads/master c: 2d98bb22c33b033182edd3a3c6b4c4e1d091db4d h: refs/heads/master i: 199881: 254ea7e7a0b83ac941ab7e4c909d667d6d5d77cc 199879: 8deee3d60829da08d63a1c1bd6b1f93fbbd1c711 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rt2860/sta_ioctl.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 671fb60dca71..46322f0edec0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c60e55f30a4dac15db51b398c3bd94e4cfbf743a +refs/heads/master: 2d98bb22c33b033182edd3a3c6b4c4e1d091db4d diff --git a/trunk/drivers/staging/rt2860/sta_ioctl.c b/trunk/drivers/staging/rt2860/sta_ioctl.c index 112da7a6c417..6b8268d3dc75 100644 --- a/trunk/drivers/staging/rt2860/sta_ioctl.c +++ b/trunk/drivers/staging/rt2860/sta_ioctl.c @@ -2522,6 +2522,8 @@ int rt28xx_sta_ioctl(IN struct net_device *net_dev, Status = copy_to_user(erq->pointer, pAd->nickname, erq->length); + if (Status) + Status = -EFAULT; break; } case SIOCGIWRATE: /*get default bit rate (bps) */