From 6636fa3cf5b42f7fbd2707ab70fbce6c110eaf92 Mon Sep 17 00:00:00 2001 From: Monam Agarwal Date: Wed, 5 Mar 2014 07:27:44 +0530 Subject: [PATCH] Staging: rts5139: Fix incorrect type in assignment in rts51x_fop.c This patch fixes following sparse warning in rts51x_fop.c Warning: incorrect type in assignment Signed-off-by: Monam Agarwal Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rts5139/rts51x_fop.c | 10 +++++----- drivers/staging/rts5139/rts51x_fop.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rts5139/rts51x_fop.c b/drivers/staging/rts5139/rts51x_fop.c index dee7d8af564e..677d18b3dcd5 100644 --- a/drivers/staging/rts5139/rts51x_fop.c +++ b/drivers/staging/rts5139/rts51x_fop.c @@ -93,7 +93,7 @@ static int rts51x_sd_direct_cmnd(struct rts51x_chip *chip, } retval = - copy_to_user((void *)cmnd->buf, (void *)buf, cmnd->buf_len); + copy_to_user(cmnd->buf, (void *)buf, cmnd->buf_len); if (retval) { kfree(buf); TRACE_RET(chip, STATUS_NOMEM); @@ -109,7 +109,7 @@ static int rts51x_sd_direct_cmnd(struct rts51x_chip *chip, TRACE_RET(chip, STATUS_NOMEM); retval = - copy_from_user((void *)buf, (void *)cmnd->buf, + copy_from_user((void *)buf, cmnd->buf, cmnd->buf_len); if (retval) { kfree(buf); @@ -154,7 +154,7 @@ static int rts51x_sd_get_rsp(struct rts51x_chip *chip, struct sd_rsp *rsp) else count = (rsp->rsp_len < 6) ? rsp->rsp_len : 6; - retval = copy_to_user((void *)rsp->rsp, (void *)sd_card->rsp, count); + retval = copy_to_user(rsp->rsp, (void *)sd_card->rsp, count); if (retval) TRACE_RET(chip, STATUS_NOMEM); @@ -250,7 +250,7 @@ long rts51x_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) switch (cmd) { case RTS5139_IOC_SD_DIRECT: retval = - copy_from_user((void *)&cmnd, (void *)arg, + copy_from_user((void *)&cmnd, (void __user *)arg, sizeof(struct sd_direct_cmnd)); if (retval) { retval = -ENOMEM; @@ -265,7 +265,7 @@ long rts51x_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) case RTS5139_IOC_SD_GET_RSP: retval = - copy_from_user((void *)&rsp, (void *)arg, + copy_from_user(&rsp, (void __user *)arg, sizeof(struct sd_rsp)); if (retval) { retval = -ENOMEM; diff --git a/drivers/staging/rts5139/rts51x_fop.h b/drivers/staging/rts5139/rts51x_fop.h index eb45acf50d1a..c691ee99720e 100644 --- a/drivers/staging/rts5139/rts51x_fop.h +++ b/drivers/staging/rts5139/rts51x_fop.h @@ -35,12 +35,12 @@ struct sd_direct_cmnd { u8 cmnd[12]; - void *buf; + void __user *buf; int buf_len; }; struct sd_rsp { - void *rsp; + void __user *rsp; int rsp_len; }; -- 2.20.1