Browse files

MFC r253393:

  Do not throw an error if the user requests to activate the image from
  an empty firmware slot, as long as the user has specified a firmware
  image to download into the empty firmware slot.

Approved by:	re (kib)
Sponsored by:	Intel
  • Loading branch information...
1 parent fe52e0a commit 7ee507bbfb493cd6fa90a8d01bf61cf2caf8f909 @jimharris jimharris committed Jul 24, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 sbin/nvmecontrol/firmware.c
@@ -246,7 +246,7 @@ firmware(int argc, char *argv[])
"slot %d specified but controller only supports %d slots",
slot, cdata.frmw.num_slots);
- if (!slot_has_valid_firmware(fd, slot))
+ if (a_flag && !f_flag && !slot_has_valid_firmware(fd, slot))
"slot %d does not contain valid firmware,\n"
"try 'nvmecontrol logpage -p 3 %s' to get a list "

0 comments on commit 7ee507b

Please sign in to comment.