Merge branch 'master' into for-next

This commit is contained in:
Jiri Kosina 2011-02-15 10:24:31 +01:00
commit 0a9d59a246
2924 changed files with 85899 additions and 27321 deletions

View file

@ -151,7 +151,7 @@ static int fetch_stats(struct atm_dev *dev,struct idt77105_stats __user *arg,int
spin_unlock_irqrestore(&idt77105_priv_lock, flags);
if (arg == NULL)
return 0;
return copy_to_user(arg, &PRIV(dev)->stats,
return copy_to_user(arg, &stats,
sizeof(struct idt77105_stats)) ? -EFAULT : 0;
}