From 70711cd5d8bf16cdb2e49a56392b796c58b0b067 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 30 Apr 2009 14:43:31 -0700 Subject: [PATCH] --- yaml --- r: 151275 b: refs/heads/master c: 8952f593ea66bff4a30f9e641dc6c79832ca64cf h: refs/heads/master i: 151273: aa6cc8c6e1fd31216d59ac702acc4d89778ea124 151271: 973e04270820653d6d597d87c3f9d6f9054b281d v: v3 --- [refs] | 2 +- trunk/drivers/pci/pcie/portdrv_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 010da002ea57..399696fa2be2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1902a9e62ba34a1071407ab61cef626e019a0923 +refs/heads/master: 8952f593ea66bff4a30f9e641dc6c79832ca64cf diff --git a/trunk/drivers/pci/pcie/portdrv_core.c b/trunk/drivers/pci/pcie/portdrv_core.c index e39982503863..13ffdc35ea0e 100644 --- a/trunk/drivers/pci/pcie/portdrv_core.c +++ b/trunk/drivers/pci/pcie/portdrv_core.c @@ -275,7 +275,7 @@ static void pcie_device_init(struct pci_dev *parent, struct pcie_device *dev, memset(device, 0, sizeof(struct device)); device->bus = &pcie_port_bus_type; device->driver = NULL; - device->driver_data = NULL; + dev_set_drvdata(device, NULL); device->release = release_pcie_device; /* callback to free pcie dev */ dev_set_name(device, "%s:pcie%02x", pci_name(parent), get_descriptor_id(port_type, service_type));