aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/media/cxd2099
diff options
context:
space:
mode:
authorAybuke Ozdemir <aybuke.147@gmail.com>2014-09-18 00:54:04 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-19 17:42:15 -0700
commitfcf1b73d08cd15912205f3b259ea81ccfde11970 (patch)
tree61c4fc6d1d17992c9660d9d4601207ca36ef3fe1 /drivers/staging/media/cxd2099
parentStaging: octeon: Missing a blank line after declarations (diff)
downloadlinux-dev-fcf1b73d08cd15912205f3b259ea81ccfde11970.tar.xz
linux-dev-fcf1b73d08cd15912205f3b259ea81ccfde11970.zip
Staging: media: cxd2099: Missing a blank line after declarations
Fix checkpatch.pl issues with missing a blank line after declarations in cxd2099.c Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media/cxd2099')
-rw-r--r--drivers/staging/media/cxd2099/cxd2099.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/media/cxd2099/cxd2099.c b/drivers/staging/media/cxd2099/cxd2099.c
index a2a5182570c5..73e7b2c9e4a7 100644
--- a/drivers/staging/media/cxd2099/cxd2099.c
+++ b/drivers/staging/media/cxd2099/cxd2099.c
@@ -152,6 +152,7 @@ static int write_pccard(struct cxd *ci, u16 address, u8 *data, u8 n)
status = i2c_write(ci->i2c, ci->cfg.adr, addr, 3);
if (!status) {
u8 buf[256] = {3};
+
memcpy(buf+1, data, n);
status = i2c_write(ci->i2c, ci->cfg.adr, buf, n+1);
}
@@ -201,6 +202,7 @@ static int write_io_data(struct cxd *ci, u8 *data, u8 n)
status = i2c_write(ci->i2c, ci->cfg.adr, addr, 3);
if (!status) {
u8 buf[256] = {3};
+
memcpy(buf+1, data, n);
status = i2c_write(ci->i2c, ci->cfg.adr, buf, n + 1);
}
@@ -448,6 +450,7 @@ static int read_attribute_mem(struct dvb_ca_en50221 *ca,
return ci->amem[address];
#else
u8 val;
+
mutex_lock(&ci->lock);
set_mode(ci, 1);
read_pccard(ci, address, &val, 1);