7bcf5c0e7f
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: Greg Kroah-Hartman <gregkh@suse.de>
58 lines
1.3 KiB
C
58 lines
1.3 KiB
C
#include <linux/kernel.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/module.h>
|
|
#include "pci.h"
|
|
|
|
int pci_hotplug (struct device *dev, char **envp, int num_envp,
|
|
char *buffer, int buffer_size)
|
|
{
|
|
struct pci_dev *pdev;
|
|
char *scratch;
|
|
int i = 0;
|
|
int length = 0;
|
|
|
|
if (!dev)
|
|
return -ENODEV;
|
|
|
|
pdev = to_pci_dev(dev);
|
|
if (!pdev)
|
|
return -ENODEV;
|
|
|
|
scratch = buffer;
|
|
|
|
|
|
if (add_hotplug_env_var(envp, num_envp, &i,
|
|
buffer, buffer_size, &length,
|
|
"PCI_CLASS=%04X", pdev->class))
|
|
return -ENOMEM;
|
|
|
|
if (add_hotplug_env_var(envp, num_envp, &i,
|
|
buffer, buffer_size, &length,
|
|
"PCI_ID=%04X:%04X", pdev->vendor, pdev->device))
|
|
return -ENOMEM;
|
|
|
|
if (add_hotplug_env_var(envp, num_envp, &i,
|
|
buffer, buffer_size, &length,
|
|
"PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,
|
|
pdev->subsystem_device))
|
|
return -ENOMEM;
|
|
|
|
if (add_hotplug_env_var(envp, num_envp, &i,
|
|
buffer, buffer_size, &length,
|
|
"PCI_SLOT_NAME=%s", pci_name(pdev)))
|
|
return -ENOMEM;
|
|
|
|
if (add_hotplug_env_var(envp, num_envp, &i,
|
|
buffer, buffer_size, &length,
|
|
"MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",
|
|
pdev->vendor, pdev->device,
|
|
pdev->subsystem_vendor, pdev->subsystem_device,
|
|
(u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
|
|
(u8)(pdev->class)))
|
|
return -ENOMEM;
|
|
|
|
envp[i] = NULL;
|
|
|
|
return 0;
|
|
}
|