2 files changed, 13 insertions, 6 deletions

diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index cf27bf40d36e..547368e9633d 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -2024,6 +2024,7 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         struct fstioc_write wrthdr;
         struct fstioc_info info;
         unsigned long flags;
+        void *buf;
 
         dbg(DBG_IOCTL, "ioctl: %x, %p\n", cmd, ifr->ifr_data);
 
@@ -2065,16 +2066,22 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                         return -ENXIO;
                 }
 
-                /* Now copy the data to the card.
-                 * This will probably break on some architectures.
-                 * I'll fix it when I have something to test on.
-                 */
-                if (copy_from_user(card->mem + wrthdr.offset,
+                /* Now copy the data to the card. */
+
+                buf = kmalloc(wrthdr.size, GFP_KERNEL);
+                if (!buf)
+                        return -ENOMEM;
+
+                if (copy_from_user(buf,
                                    ifr->ifr_data + sizeof (struct fstioc_write),
                                    wrthdr.size)) {
+                        kfree(buf);
                         return -EFAULT;
                 }
 
+                memcpy_toio(card->mem + wrthdr.offset, buf, wrthdr.size);
+                kfree(buf);
+
                 /* Writes to the memory of a card in the reset state constitute
                  * a download
                  */
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 15d5c58e57bc..e59255a155a9 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -751,7 +751,7 @@ upload_data( struct net_device  *dev,  unsigned  framelen,  unsigned  frameno,
 }
 
 
-static __inline void
+static inline void
 send_complete( struct net_local  *nl )
 {
 #ifdef CONFIG_SBNI_MULTILINE