Skip to content

Commit cc5cb5a

Browse files
committed
Merge tag 'platform-drivers-x86-v4.16-3' of git://github.com/dvhart/linux-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
2 parents e9d46f7 + 1bd42d9 commit cc5cb5a

File tree

2 files changed

+363
-11
lines changed

2 files changed

+363
-11
lines changed

drivers/platform/mellanox/mlxreg-hotplug.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ mlxreg_hotplug_health_work_helper(struct mlxreg_hotplug_priv_data *priv,
300300
{
301301
struct mlxreg_core_data *data = item->data;
302302
u32 regval;
303-
int i, ret;
303+
int i, ret = 0;
304304

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

0 commit comments

Comments
 (0)