Merging upstream version 2.14.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
0d9181726f
commit
f268303a51
572 changed files with 4636 additions and 1730 deletions
|
@ -130,7 +130,7 @@ static int sed_opal_revert(int argc, char **argv, struct command *cmd,
|
|||
return err;
|
||||
|
||||
err = sedopal_cmd_revert(dev->direct.fd);
|
||||
if ((err != 0) && (err != -EOPNOTSUPP))
|
||||
if ((err != 0) && (err != -EOPNOTSUPP) && (err != EPERM))
|
||||
fprintf(stderr, "revert: SED error - %s\n",
|
||||
sedopal_error_to_text(err));
|
||||
|
||||
|
@ -190,7 +190,7 @@ static int sed_opal_password(int argc, char **argv, struct command *cmd,
|
|||
return err;
|
||||
|
||||
err = sedopal_cmd_password(dev->direct.fd);
|
||||
if (err != 0)
|
||||
if ((err != 0) && (err != EPERM))
|
||||
fprintf(stderr, "password: SED error - %s\n",
|
||||
sedopal_error_to_text(err));
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue