Skip to content

Commit

Permalink
Merge tag 'platform-drivers-x86-v4.16-3' of git://github.com/dvhart/l…
Browse files Browse the repository at this point in the history
…inux-pdx86

Pull x86 platform driver updates from Darren Hart:
 "Mellanox fixes and new system type support.

  Mostly data for new system types with a correction and an
  uninitialized variable fix"

[ Pulling from github because git.infradead.org currently seems to be
  down for some reason, but Darren had a backup location    - Linus ]

* tag 'platform-drivers-x86-v4.16-3' of git://github.com/dvhart/linux-pdx86:
  platform/x86: mlx-platform: Add support for new 200G IB and Ethernet systems
  platform/x86: mlx-platform: Add support for new msn201x system type
  platform/x86: mlx-platform: Add support for new msn274x system type
  platform/x86: mlx-platform: Fix power cable setting for msn21xx family
  platform/x86: mlx-platform: Add define for the negative bus
  platform/x86: mlx-platform: Use defines for bus assignment
  platform/mellanox: mlxreg-hotplug: Fix uninitialized variable
  • Loading branch information
torvalds committed Feb 10, 2018
2 parents e9d46f7 + 1bd42d9 commit cc5cb5a
Show file tree
Hide file tree
Showing 2 changed files with 363 additions and 11 deletions.
2 changes: 1 addition & 1 deletion drivers/platform/mellanox/mlxreg-hotplug.c
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ mlxreg_hotplug_health_work_helper(struct mlxreg_hotplug_priv_data *priv,
{
struct mlxreg_core_data *data = item->data;
u32 regval;
int i, ret;
int i, ret = 0;

for (i = 0; i < item->count; i++, data++) {
/* Mask event. */
Expand Down
Loading

0 comments on commit cc5cb5a

Please sign in to comment.