diff options
| author | James Morris <james.morris@microsoft.com> | 2018-03-22 22:26:16 +0100 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-03-22 22:26:16 +0100 |
| commit | 5893ed18a26d1f56b97c0290b0cbbc2d49d6de28 (patch) | |
| tree | 97aa931519fca28a0a12fad7485347198f8267cc /block/sed-opal.c | |
| parent | exec: Set file unwritable before LSM check (diff) | |
| parent | Linux 4.16-rc6 (diff) | |
| download | linux-5893ed18a26d1f56b97c0290b0cbbc2d49d6de28.tar.xz linux-5893ed18a26d1f56b97c0290b0cbbc2d49d6de28.zip | |
Merge tag 'v4.16-rc6' into next-general
Merge to Linux 4.16-rc6 at the request of Jarkko, for his TPM updates.
Diffstat (limited to 'block/sed-opal.c')
| -rw-r--r-- | block/sed-opal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/sed-opal.c b/block/sed-opal.c index 9ed51d0c6b1d..e4929eec547f 100644 --- a/block/sed-opal.c +++ b/block/sed-opal.c @@ -490,7 +490,7 @@ static int opal_discovery0_end(struct opal_dev *dev) if (!found_com_id) { pr_debug("Could not find OPAL comid for device. Returning early\n"); - return -EOPNOTSUPP;; + return -EOPNOTSUPP; } dev->comid = comid; |