staging: i4l: icn: use memdup_user

Its better to use memdup_user which does the same thing which this
code has implemented. Also removed a related warning as we will be
warned if allocation fails.

Suggested-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/i4l/icn/icn.c b/drivers/staging/i4l/icn/icn.c
index b2f4055d99e79eae068ef7d863cb6cc72c178ca5..415124f9dd2e9de079440891c02a75bcf32962e6 100644 (file)
--- a/drivers/staging/i4l/icn/icn.c
+++ b/drivers/staging/i4l/icn/icn.c
@@ -810,16 +810,10 @@ icn_loadboot(u_char __user *buffer, icn_card *card)
 #ifdef BOOT_DEBUG
        printk(KERN_DEBUG "icn_loadboot called, buffaddr=%08lx\n", (ulong) buffer);
 #endif
-       codebuf = kmalloc(ICN_CODE_STAGE1, GFP_KERNEL);
-       if (!codebuf) {
-               printk(KERN_WARNING "icn: Could not allocate code buffer\n");
-               ret = -ENOMEM;
-               goto out;
-       }
-       if (copy_from_user(codebuf, buffer, ICN_CODE_STAGE1)) {
-               ret = -EFAULT;
-               goto out_kfree;
-       }
+       codebuf = memdup_user(buffer, ICN_CODE_STAGE1);
+       if (IS_ERR(codebuf))
+               return PTR_ERR(codebuf);
+
        if (!card->rvalid) {
                if (!request_region(card->port, ICN_PORTLEN, card->regname)) {
                        printk(KERN_WARNING
@@ -902,7 +896,6 @@ icn_loadboot(u_char __user *buffer, icn_card *card)
 
 out_kfree:
        kfree(codebuf);
-out:
        return ret;
 }