Commit 7bcf5c0e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

[PATCH] PCI: move pci core to use add_hotplug_env_var()

This fixes a bug in the environment variables for all PCI device hotplug calls.

Thanks to Kay Sievers for pointing out the problem.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2fd9d74b
...@@ -20,46 +20,35 @@ int pci_hotplug (struct device *dev, char **envp, int num_envp, ...@@ -20,46 +20,35 @@ int pci_hotplug (struct device *dev, char **envp, int num_envp,
scratch = buffer; scratch = buffer;
/* stuff we want to pass to /sbin/hotplug */
envp[i++] = scratch; if (add_hotplug_env_var(envp, num_envp, &i,
length += scnprintf (scratch, buffer_size - length, "PCI_CLASS=%04X", buffer, buffer_size, &length,
pdev->class); "PCI_CLASS=%04X", pdev->class))
if ((buffer_size - length <= 0) || (i >= num_envp))
return -ENOMEM; return -ENOMEM;
++length;
scratch += length;
envp[i++] = scratch; if (add_hotplug_env_var(envp, num_envp, &i,
length += scnprintf (scratch, buffer_size - length, "PCI_ID=%04X:%04X", buffer, buffer_size, &length,
pdev->vendor, pdev->device); "PCI_ID=%04X:%04X", pdev->vendor, pdev->device))
if ((buffer_size - length <= 0) || (i >= num_envp))
return -ENOMEM; return -ENOMEM;
++length;
scratch += length;
envp[i++] = scratch; if (add_hotplug_env_var(envp, num_envp, &i,
length += scnprintf (scratch, buffer_size - length, buffer, buffer_size, &length,
"PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor, "PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,
pdev->subsystem_device); pdev->subsystem_device))
if ((buffer_size - length <= 0) || (i >= num_envp))
return -ENOMEM; return -ENOMEM;
++length;
scratch += length;
envp[i++] = scratch; if (add_hotplug_env_var(envp, num_envp, &i,
length += scnprintf (scratch, buffer_size - length, "PCI_SLOT_NAME=%s", buffer, buffer_size, &length,
pci_name(pdev)); "PCI_SLOT_NAME=%s", pci_name(pdev)))
if ((buffer_size - length <= 0) || (i >= num_envp))
return -ENOMEM; return -ENOMEM;
envp[i++] = scratch; if (add_hotplug_env_var(envp, num_envp, &i,
length += scnprintf (scratch, buffer_size - length, buffer, buffer_size, &length,
"MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x", "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",
pdev->vendor, pdev->device, pdev->vendor, pdev->device,
pdev->subsystem_vendor, pdev->subsystem_device, pdev->subsystem_vendor, pdev->subsystem_device,
(u8)(pdev->class >> 16), (u8)(pdev->class >> 8), (u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
(u8)(pdev->class)); (u8)(pdev->class)))
if ((buffer_size - length <= 0) || (i >= num_envp))
return -ENOMEM; return -ENOMEM;
envp[i] = NULL; envp[i] = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment