diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2017-03-24 22:33:22 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2017-03-24 22:33:22 +0100 |
| commit | 9667ac21619a16bb0c280372fd4bb14be08d07f6 (patch) | |
| tree | 870a1e4c31a363cae23e72314ca9120a5916bd69 /drivers/staging | |
| parent | c1177831f5a1fd3ee9e5c3f9567526a5d62d5d78 (diff) | |
| parent | a4418c438de6ad397fd17f006ca86257fb9ec5a6 (diff) | |
Merge remote-tracking branch 'fslc/4.1-2.0.x-imx' into toradex_4.1-2.0.x-imx
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_common.c | 2 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/llite/llite_lib.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 4b8da862cd7e..f7bcefd46b5e 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -2079,7 +2079,7 @@ static int ni_ai_insn_read(struct comedi_device *dev, unsigned int *data) { struct ni_private *devpriv = dev->private; - unsigned int mask = (s->maxdata + 1) >> 1; + unsigned int mask = s->maxdata; int i, n; unsigned signbits; unsigned int d; diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c index a27af7882170..d60425996948 100644 --- a/drivers/staging/lustre/lustre/llite/llite_lib.c +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c @@ -1323,7 +1323,7 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import) attr->ia_valid |= ATTR_MTIME | ATTR_CTIME; } - /* POSIX: check before ATTR_*TIME_SET set (from inode_change_ok) */ + /* POSIX: check before ATTR_*TIME_SET set (from setattr_prepare) */ if (attr->ia_valid & TIMES_SET_FLAGS) { if ((!uid_eq(current_fsuid(), inode->i_uid)) && !capable(CFS_CAP_FOWNER)) |