diff options
| -rw-r--r-- | drivers/staging/pohmelfs/config.c | 3 | ||||
| -rw-r--r-- | drivers/staging/pohmelfs/dir.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/pohmelfs/config.c b/drivers/staging/pohmelfs/config.c index a6eaa42fb66..99ae1d9649a 100644 --- a/drivers/staging/pohmelfs/config.c +++ b/drivers/staging/pohmelfs/config.c @@ -446,9 +446,8 @@ out_unlock: return err; } -static void pohmelfs_cn_callback(void *data) +static void pohmelfs_cn_callback(struct cn_msg *msg) { - struct cn_msg *msg = data; int err; switch (msg->flags) { diff --git a/drivers/staging/pohmelfs/dir.c b/drivers/staging/pohmelfs/dir.c index 4c58e22c1fb..4c63a4cc1bd 100644 --- a/drivers/staging/pohmelfs/dir.c +++ b/drivers/staging/pohmelfs/dir.c @@ -412,7 +412,7 @@ static int pohmelfs_readdir(struct file *file, void *dirent, filldir_t filldir) __func__, file->f_pos, pi->ino, n->data, n->len, n->ino, n->mode, mode, file->f_pos, n->hash); - file->private_data = (void *)n->hash; + file->private_data = (void *)(unsigned long)n->hash; len = n->len; err = filldir(dirent, n->data, n->len, file->f_pos, n->ino, mode); |