Merge commit v3.13-rc1 into kbuild/misc

3 files changed, 5 insertions, 5 deletions

diff --git a/samples/kfifo/bytestream-example.c b/samples/kfifo/bytestream-example.c
index cfe40addda76..2fca916d9edf 100644
--- a/samples/kfifo/bytestream-example.c
+++ b/samples/kfifo/bytestream-example.c
@@ -64,7 +64,7 @@ static int __init testfunc(void)
 
         /* put values into the fifo */
         for (i = 0; i != 10; i++)
-                kfifo_put(&test, &i);
+                kfifo_put(&test, i);
 
         /* show the number of used elements */
         printk(KERN_INFO "fifo len: %u\n", kfifo_len(&test));
@@ -85,7 +85,7 @@ static int __init testfunc(void)
         kfifo_skip(&test);
 
         /* put values into the fifo until is full */
-        for (i = 20; kfifo_put(&test, &i); i++)
+        for (i = 20; kfifo_put(&test, i); i++)
                 ;
 
         printk(KERN_INFO "queue len: %u\n", kfifo_len(&test));
diff --git a/samples/kfifo/dma-example.c b/samples/kfifo/dma-example.c
index 06473791c08a..aa243db93f01 100644
--- a/samples/kfifo/dma-example.c
+++ b/samples/kfifo/dma-example.c
@@ -39,7 +39,7 @@ static int __init example_init(void)
         kfifo_in(&fifo, "test", 4);
 
         for (i = 0; i != 9; i++)
-                kfifo_put(&fifo, &i);
+                kfifo_put(&fifo, i);
 
         /* kick away first byte */
         kfifo_skip(&fifo);
diff --git a/samples/kfifo/inttype-example.c b/samples/kfifo/inttype-example.c
index 6f8e79e76c9e..8dc3c2e7105a 100644
--- a/samples/kfifo/inttype-example.c
+++ b/samples/kfifo/inttype-example.c
@@ -61,7 +61,7 @@ static int __init testfunc(void)
 
         /* put values into the fifo */
         for (i = 0; i != 10; i++)
-                kfifo_put(&test, &i);
+                kfifo_put(&test, i);
 
         /* show the number of used elements */
         printk(KERN_INFO "fifo len: %u\n", kfifo_len(&test));
@@ -78,7 +78,7 @@ static int __init testfunc(void)
         kfifo_skip(&test);
 
         /* put values into the fifo until is full */
-        for (i = 20; kfifo_put(&test, &i); i++)
+        for (i = 20; kfifo_put(&test, i); i++)
                 ;
 
         printk(KERN_INFO "queue len: %u\n", kfifo_len(&test));