[PATCH] simplify wdt285 copying.

copy_to_user already does the relevant checking.

[PATCH] simplify wdt285 copying.
copy_to_user already does the relevant checking.
ea20670f · Dave Jones · Linus Torvalds · 65da4ecc · ea20670f
Commit ea20670f authored May 06, 2002 by Dave Jones Committed by Linus Torvalds May 06, 2002
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

drivers/char/wdt285.c drivers/char/wdt285.c +3 -5

No files found.
--- a/drivers/char/wdt285.c
+++ b/drivers/char/wdt285.c
@@ -136,11 +136,9 @@ static int watchdog_ioctl(struct inode *inode, struct file *file,
 		default:
 			return -ENOTTY;
 		case WDIOC_GETSUPPORT:
-			i = verify_area(VERIFY_WRITE, (void*) arg, sizeof(struct watchdog_info));
+			if(copy_to_user((struct watchdog_info *)arg, &ident, sizeof(ident)))
-			if (i)
+				return -EFAULT;
-				return i;
+			return 0;
-			else
-				return copy_to_user((struct watchdog_info *)arg, &ident, sizeof(ident));
 		case WDIOC_GETSTATUS:
 		case WDIOC_GETBOOTSTATUS:
 			return put_user(0,(int *)arg);