diff options
Diffstat (limited to 'drivers/staging/crystalhd/crystalhd_lnx.c')
-rw-r--r-- | drivers/staging/crystalhd/crystalhd_lnx.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c index 99eefd0291c3..20be9571990a 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.c +++ b/drivers/staging/crystalhd/crystalhd_lnx.c @@ -111,7 +111,7 @@ static void chd_dec_free_iodata(struct crystalhd_adp *adp, spin_unlock_irqrestore(&adp->lock, flags); } -static inline int crystalhd_user_data(unsigned long ud, void *dr, +static inline int crystalhd_user_data(void __user *ud, void *dr, int size, int set) { int rc; @@ -122,9 +122,9 @@ static inline int crystalhd_user_data(unsigned long ud, void *dr, } if (set) - rc = copy_to_user((void *)ud, dr, size); + rc = copy_to_user(ud, dr, size); else - rc = copy_from_user(dr, (void *)ud, size); + rc = copy_from_user(dr, ud, size); if (rc) { BCMLOG_ERR("Invalid args for command\n"); @@ -153,7 +153,8 @@ static int chd_dec_fetch_cdata(struct crystalhd_adp *adp, io->add_cdata_sz = m_sz; ua_off = ua + sizeof(io->udata); - rc = crystalhd_user_data(ua_off, io->add_cdata, io->add_cdata_sz, 0); + rc = crystalhd_user_data((void __user *)ua_off, io->add_cdata, + io->add_cdata_sz, 0); if (rc) { BCMLOG_ERR("failed to pull add_cdata sz:%x ua_off:%x\n", io->add_cdata_sz, (unsigned int)ua_off); @@ -178,7 +179,7 @@ static int chd_dec_release_cdata(struct crystalhd_adp *adp, if (io->cmd != BCM_IOC_FW_DOWNLOAD) { ua_off = ua + sizeof(io->udata); - rc = crystalhd_user_data(ua_off, io->add_cdata, + rc = crystalhd_user_data((void __user *)ua_off, io->add_cdata, io->add_cdata_sz, 1); if (rc) { BCMLOG_ERR( @@ -208,7 +209,8 @@ static int chd_dec_proc_user_data(struct crystalhd_adp *adp, return -EINVAL; } - rc = crystalhd_user_data(ua, &io->udata, sizeof(io->udata), set); + rc = crystalhd_user_data((void __user *)ua, &io->udata, + sizeof(io->udata), set); if (rc) { BCMLOG_ERR("failed to %s iodata\n", (set ? "set" : "get")); return rc; @@ -546,9 +548,10 @@ static int chd_dec_pci_probe(struct pci_dev *pdev, int rc; enum BC_STATUS sts = BC_STS_SUCCESS; - BCMLOG(BCMLOG_DBG, "PCI_INFO: Vendor:0x%04x Device:0x%04x s_vendor:0x%04x s_device: 0x%04x\n", - pdev->vendor, pdev->device, pdev->subsystem_vendor, - pdev->subsystem_device); + BCMLOG(BCMLOG_DBG, + "PCI_INFO: Vendor:0x%04x Device:0x%04x s_vendor:0x%04x s_device: 0x%04x\n", + pdev->vendor, pdev->device, pdev->subsystem_vendor, + pdev->subsystem_device); pinfo = kzalloc(sizeof(struct crystalhd_adp), GFP_KERNEL); if (!pinfo) { |