Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
lsgunth committed Jan 9, 2018
2 parents c342548 + 6b696b0 commit e9d684c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ int switchtec_fw_cfg_info(struct switchtec_dev *dev,
if (ret < 0)
return ret;

if (info[0].active) {
if (switchtec_fw_active(&info[0])) {
if (act_cfg)
memcpy(act_cfg, &info[0], sizeof(*act_cfg));
if (inact_cfg)
Expand Down Expand Up @@ -617,7 +617,7 @@ int switchtec_fw_img_info(struct switchtec_dev *dev,
if (ret < 0)
return ret;

if (info[0].active) {
if (switchtec_fw_active(&info[0])) {
if (act_img)
memcpy(act_img, &info[0], sizeof(*act_img));
if (inact_img)
Expand Down

0 comments on commit e9d684c

Please sign in to comment.