tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

staging: vme_user: remove okcount variable

Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Dmitry Kalinkin and committed by
Greg Kroah-Hartman 32491f56 18f8bee2

+6 -12
+6 -12
drivers/staging/vme/devices/vme_user.c
··· 182 182 unsigned int minor = MINOR(file_inode(file)->i_rdev); 183 183 ssize_t retval; 184 184 size_t image_size; 185 - size_t okcount; 186 185 187 186 if (minor == CONTROL_MINOR) 188 187 return 0; ··· 199 200 200 201 /* Ensure not reading past end of the image */ 201 202 if (*ppos + count > image_size) 202 - okcount = image_size - *ppos; 203 - else 204 - okcount = count; 203 + count = image_size - *ppos; 205 204 206 205 switch (type[minor]) { 207 206 case MASTER_MINOR: 208 - retval = resource_to_user(minor, buf, okcount, ppos); 207 + retval = resource_to_user(minor, buf, count, ppos); 209 208 break; 210 209 case SLAVE_MINOR: 211 - retval = buffer_to_user(minor, buf, okcount, ppos); 210 + retval = buffer_to_user(minor, buf, count, ppos); 212 211 break; 213 212 default: 214 213 retval = -EINVAL; ··· 225 228 unsigned int minor = MINOR(file_inode(file)->i_rdev); 226 229 ssize_t retval; 227 230 size_t image_size; 228 - size_t okcount; 229 231 230 232 if (minor == CONTROL_MINOR) 231 233 return 0; ··· 241 245 242 246 /* Ensure not reading past end of the image */ 243 247 if (*ppos + count > image_size) 244 - okcount = image_size - *ppos; 245 - else 246 - okcount = count; 248 + count = image_size - *ppos; 247 249 248 250 switch (type[minor]) { 249 251 case MASTER_MINOR: 250 - retval = resource_from_user(minor, buf, okcount, ppos); 252 + retval = resource_from_user(minor, buf, count, ppos); 251 253 break; 252 254 case SLAVE_MINOR: 253 - retval = buffer_from_user(minor, buf, okcount, ppos); 255 + retval = buffer_from_user(minor, buf, count, ppos); 254 256 break; 255 257 default: 256 258 retval = -EINVAL;