Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 194592
b: refs/heads/master
c: b548a98
h: refs/heads/master
v: v3
  • Loading branch information
Ben Hutchings authored and David S. Miller committed Apr 28, 2010
1 parent f29f78f commit 7c2453e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 41b7e4c3268d9d2056b9c94cceb386649f7b185b
refs/heads/master: b548a988a9d08f2b06f6810b1a4cde6f632bd307
10 changes: 8 additions & 2 deletions trunk/drivers/net/sfc/mcdi.c
Original file line number Diff line number Diff line change
Expand Up @@ -932,20 +932,26 @@ int efx_mcdi_nvram_test_all(struct efx_nic *efx)

rc = efx_mcdi_nvram_types(efx, &nvram_types);
if (rc)
return rc;
goto fail1;

type = 0;
while (nvram_types != 0) {
if (nvram_types & 1) {
rc = efx_mcdi_nvram_test(efx, type);
if (rc)
return rc;
goto fail2;
}
type++;
nvram_types >>= 1;
}

return 0;

fail2:
EFX_ERR(efx, "%s: failed type=%u\n", __func__, type);
fail1:
EFX_ERR(efx, "%s: failed rc=%d\n", __func__, rc);
return rc;
}

static int efx_mcdi_read_assertion(struct efx_nic *efx)
Expand Down

0 comments on commit 7c2453e

Please sign in to comment.