1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 41838773b568..974d17f0263e 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -203,13 +203,12 @@ static int set_registers(pegasus_t * pegasus, __u16 indx, __u16 size,
         char *buffer;
         DECLARE_WAITQUEUE(wait, current);
 
-        buffer = kmalloc(size, GFP_KERNEL);
+        buffer = kmemdup(data, size, GFP_KERNEL);
         if (!buffer) {
                 netif_warn(pegasus, drv, pegasus->net,
                            "out of memory in %s\n", __func__);
                 return -ENOMEM;
         }
-        memcpy(buffer, data, size);
 
         add_wait_queue(&pegasus->ctrl_wait, &wait);
         set_current_state(TASK_UNINTERRUPTIBLE);
@@ -255,13 +254,12 @@ static int set_register(pegasus_t * pegasus, __u16 indx, __u8 data)
         char *tmp;
         DECLARE_WAITQUEUE(wait, current);
 
-        tmp = kmalloc(1, GFP_KERNEL);
+        tmp = kmemdup(&data, 1, GFP_KERNEL);
         if (!tmp) {
                 netif_warn(pegasus, drv, pegasus->net,
                            "out of memory in %s\n", __func__);
                 return -ENOMEM;
         }
-        memcpy(tmp, &data, 1);
         add_wait_queue(&pegasus->ctrl_wait, &wait);
         set_current_state(TASK_UNINTERRUPTIBLE);
         while (pegasus->flags & ETH_REGS_CHANGED)
@@ -808,7 +806,7 @@ static void write_bulk_callback(struct urb *urb)
                 break;
         }
 
-        net->trans_start = jiffies;
+        net->trans_start = jiffies; /* prevent tx timeout */
         netif_wake_queue(net);
 }
 
@@ -909,7 +907,6 @@ static netdev_tx_t pegasus_start_xmit(struct sk_buff *skb,
         } else {
                 pegasus->stats.tx_packets++;
                 pegasus->stats.tx_bytes += skb->len;
-                net->trans_start = jiffies;
         }
         dev_kfree_skb(skb);