diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
| commit | f499cae1e59d75d5eb24c23d47cf8986e6032c6d (patch) | |
| tree | 1af6235c18391212c40116eb90b01eae8938efee /drivers/pci/access.c | |
| parent | fc3f55e672e1ed917dd9e215af81939cd3d717da (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/pci/access.c')
| -rw-r--r-- | drivers/pci/access.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/access.c b/drivers/pci/access.c index 381444794778..64dd7df90e62 100644 --- a/drivers/pci/access.c +++ b/drivers/pci/access.c | |||
| @@ -356,7 +356,8 @@ int pci_vpd_truncate(struct pci_dev *dev, size_t size) | |||
| 356 | return -EINVAL; | 356 | return -EINVAL; |
| 357 | 357 | ||
| 358 | dev->vpd->len = size; | 358 | dev->vpd->len = size; |
| 359 | dev->vpd->attr->size = size; | 359 | if (dev->vpd->attr) |
| 360 | dev->vpd->attr->size = size; | ||
| 360 | 361 | ||
| 361 | return 0; | 362 | return 0; |
| 362 | } | 363 | } |