From 462c60386eed319b2b4f9a26a52489b19942d16e Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Mon, 9 Jun 2008 16:44:30 -0700 Subject: [PATCH] --- yaml --- r: 102912 b: refs/heads/master c: cc0d9ff2c998410c7d4a99061a3ebdaa5c55ae9d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/airo.c | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 9ac61ec23f14..5aa11fb631c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9f853ddd352954815a023c4811629ed117df2f8 +refs/heads/master: cc0d9ff2c998410c7d4a99061a3ebdaa5c55ae9d diff --git a/trunk/drivers/net/wireless/airo.c b/trunk/drivers/net/wireless/airo.c index 1e1446bf4b48..e30f8b79ea89 100644 --- a/trunk/drivers/net/wireless/airo.c +++ b/trunk/drivers/net/wireless/airo.c @@ -4561,22 +4561,13 @@ static ssize_t proc_read( struct file *file, size_t len, loff_t *offset ) { - loff_t pos = *offset; - struct proc_data *priv = (struct proc_data*)file->private_data; + struct proc_data *priv = file->private_data; if (!priv->rbuffer) return -EINVAL; - if (pos < 0) - return -EINVAL; - if (pos >= priv->readlen) - return 0; - if (len > priv->readlen - pos) - len = priv->readlen - pos; - if (copy_to_user(buffer, priv->rbuffer + pos, len)) - return -EFAULT; - *offset = pos + len; - return len; + return simple_read_from_buffer(buffer, len, offset, priv->rbuffer, + priv->readlen); } /*