Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 106a47ba authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

Staging: pohmelfs: fix type errors 



Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 76efa5e3

drivers/staging/pohmelfs/config.c

+1 −2
Original line number Diff line number Diff line
@@ -446,9 +446,8 @@ static int pohmelfs_cn_crypto(struct cn_msg *msg) 
	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) {

drivers/staging/pohmelfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -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);