From 97b2a31e55bf47060a0cc809c8509485cf1b2017 Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Thu, 24 Jun 2010 19:15:09 -0400
Subject: [PATCH] --- yaml --- r: 201007 b: refs/heads/master c:
 a8bf2bc212e129dd59a8b06cdbc15079cc3bd876 h: refs/heads/master i:   201005:
 10a00dd7d20591e5a20d947efb0bc3f6a1758f4f   201003:
 fd5d84c786d01d85f54b9f2dd984d2780c6659df   200999:
 c2e5f3b91ba3013acb6256c0c66eed4abdd6832a   200991:
 2b7ab516224987f7bcc496a2b7c348c4af278b5a v: v3

---
 [refs]                                       |  2 +-
 trunk/crypto/ablkcipher.c                    |  2 +-
 trunk/drivers/input/mouse/synaptics.c        |  1 -
 trunk/drivers/input/touchscreen/w90p910_ts.c |  2 +-
 trunk/fs/gfs2/bmap.c                         |  1 +
 trunk/include/linux/i8042.h                  | 12 ++++++------
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index c10bc61f7c33..61ad563ed449 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc10b6ffd39ef982f86de68d95e5811df82cf819
+refs/heads/master: a8bf2bc212e129dd59a8b06cdbc15079cc3bd876
diff --git a/trunk/crypto/ablkcipher.c b/trunk/crypto/ablkcipher.c
index a854df2a5a4b..98a66103f4f2 100644
--- a/trunk/crypto/ablkcipher.c
+++ b/trunk/crypto/ablkcipher.c
@@ -165,7 +165,7 @@ static inline int ablkcipher_next_slow(struct ablkcipher_request *req,
 
 	p = kmalloc(n, GFP_ATOMIC);
 	if (!p)
-		return ablkcipher_walk_done(req, walk, -ENOMEM);
+		ablkcipher_walk_done(req, walk, -ENOMEM);
 
 	base = p + 1;
 
diff --git a/trunk/drivers/input/mouse/synaptics.c b/trunk/drivers/input/mouse/synaptics.c
index 9ba9c4a17e15..40cea334ad13 100644
--- a/trunk/drivers/input/mouse/synaptics.c
+++ b/trunk/drivers/input/mouse/synaptics.c
@@ -206,7 +206,6 @@ static int synaptics_resolution(struct psmouse *psmouse)
 	unsigned char max[3];
 
 	if (SYN_ID_MAJOR(priv->identity) < 4)
-		return 0;
 
 	if (synaptics_send_cmd(psmouse, SYN_QUE_RESOLUTION, res) == 0) {
 		if (res[0] != 0 && (res[1] & 0x80) && res[2] != 0) {
diff --git a/trunk/drivers/input/touchscreen/w90p910_ts.c b/trunk/drivers/input/touchscreen/w90p910_ts.c
index 7a45d68c3516..cc18265be1a8 100644
--- a/trunk/drivers/input/touchscreen/w90p910_ts.c
+++ b/trunk/drivers/input/touchscreen/w90p910_ts.c
@@ -233,7 +233,7 @@ static int __devinit w90x900ts_probe(struct platform_device *pdev)
 	w90p910_ts->state = TS_IDLE;
 	spin_lock_init(&w90p910_ts->lock);
 	setup_timer(&w90p910_ts->timer, w90p910_check_pen_up,
-		    (unsigned long)w90p910_ts);
+		    (unsigned long)&w90p910_ts);
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!res) {
diff --git a/trunk/fs/gfs2/bmap.c b/trunk/fs/gfs2/bmap.c
index 4a48c0f4b402..84da64b551b2 100644
--- a/trunk/fs/gfs2/bmap.c
+++ b/trunk/fs/gfs2/bmap.c
@@ -1041,6 +1041,7 @@ static int trunc_start(struct gfs2_inode *ip, u64 size)
 
 	if (gfs2_is_stuffed(ip)) {
 		u64 dsize = size + sizeof(struct gfs2_inode);
+		ip->i_disksize = size;
 		ip->i_inode.i_mtime = ip->i_inode.i_ctime = CURRENT_TIME;
 		gfs2_trans_add_bh(ip->i_gl, dibh, 1);
 		gfs2_dinode_out(ip, dibh->b_data);
diff --git a/trunk/include/linux/i8042.h b/trunk/include/linux/i8042.h
index a986ff588944..9bf6870ee5f4 100644
--- a/trunk/include/linux/i8042.h
+++ b/trunk/include/linux/i8042.h
@@ -46,31 +46,31 @@ int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str,
 
 #else
 
-static inline void i8042_lock_chip(void)
+void i8042_lock_chip(void)
 {
 }
 
-static inline void i8042_unlock_chip(void)
+void i8042_unlock_chip(void)
 {
 }
 
-static inline int i8042_command(unsigned char *param, int command)
+int i8042_command(unsigned char *param, int command)
 {
 	return -ENODEV;
 }
 
-static inline bool i8042_check_port_owner(const struct serio *serio)
+bool i8042_check_port_owner(const struct serio *serio)
 {
 	return false;
 }
 
-static inline int i8042_install_filter(bool (*filter)(unsigned char data, unsigned char str,
+int i8042_install_filter(bool (*filter)(unsigned char data, unsigned char str,
 					struct serio *serio))
 {
 	return -ENODEV;
 }
 
-static inline int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str,
+int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str,
 				       struct serio *serio))
 {
 	return -ENODEV;