diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 12:47:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 12:47:28 +0100 |
| commit | 7df4edb07cf54a4868b9a750424c0d2aa68f8d66 (patch) | |
| tree | 0ad0ad3f3dcb6f9edf26dde42ba625053dddf54f /drivers/pci/pci-sysfs.c | |
| parent | 0d688da5505d77bcef2441e0a22d8cc26459702d (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'drivers/pci/pci-sysfs.c')
| -rw-r--r-- | drivers/pci/pci-sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index db7ec14fa71..dfc4e0ddf24 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -768,8 +768,8 @@ pci_read_rom(struct kobject *kobj, struct bin_attribute *bin_attr, return -EINVAL; rom = pci_map_rom(pdev, &size); /* size starts out as PCI window size */ - if (!rom) - return 0; + if (!rom || !size) + return -EIO; if (off >= size) count = 0; |