From: James Bottomley <James.Bottomley@SteelEye.com>
To: Michael Ellerman <michael@ellerman.id.au>
Cc: Greg Kroah-Hartman <greg@kroah.com>,
linux-mips@linux-mips.org, dev-etrax@axis.com,
linux-ia64@vger.kernel.org, discuss@x86-64.org, chris@zankel.net,
dhowells@redhat.com, linuxppc-dev@ozlabs.org,
linux-m68k@vger.kernel.org, ink@jurassic.park.msu.ru,
gerg@uclinux.org, sparclinux@vger.kernel.org,
uclinux-v850@lsi.nec.co.jp, linux-pci@atrey.karlin.mff.cuni.cz,
parisc-linux@parisc-linux.org, kernel@wantstofly.org,
rth@twiddle.net
Subject: Re: [parisc-linux] [PATCH 2/2] Make pcibios_add_platform_entries()
Date: Tue, 06 Mar 2007 18:05:01 +0000 [thread overview]
Message-ID: <1173204301.3379.33.camel@mulgrave.il.steeleye.com> (raw)
In-Reply-To: <20070306150725.68D97DDF36@ozlabs.org>
On Tue, 2007-03-06 at 16:06 +0100, Michael Ellerman wrote:
> int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
> @@ -644,10 +644,13 @@ int __must_check pci_create_sysfs_dev_fi
> }
> }
> /* add platform-specific attributes */
> - pcibios_add_platform_entries(pdev);
> + if (pcibios_add_platform_entries(pdev))
> + goto err_rom_attr;
>
> return 0;
>
> +err_rom_attr:
> + sysfs_remove_bin_file(&pdev->dev.kobj, rom_attr);
This file is only created if the rom resource has a non-zero length. If
you unconditionally call sysfs_remove_bin_file() it's going to spit
scary warnings and dump traces in this error leg if the rom resource
doesn't exist.
James
> err_rom:
> kfree(rom_attr);
> err_bin_file:
> Index: msi-new/include/linux/pci.h
> =================================> --- msi-new.orig/include/linux/pci.h
> +++ msi-new/include/linux/pci.h
> @@ -857,7 +857,7 @@ extern int pci_pci_problems;
> extern unsigned long pci_cardbus_io_size;
> extern unsigned long pci_cardbus_mem_size;
>
> -extern void pcibios_add_platform_entries(struct pci_dev *dev);
> +extern int pcibios_add_platform_entries(struct pci_dev *dev);
>
> #endif /* __KERNEL__ */
> #endif /* LINUX_PCI_H */
> _______________________________________________
> parisc-linux mailing list
> parisc-linux@lists.parisc-linux.org
> http://lists.parisc-linux.org/mailman/listinfo/parisc-linux
next prev parent reply other threads:[~2007-03-06 18:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-06 15:06 [PATCH 1/2] Use a weak symbol for the empty version of pcibios_add_platform_entries() Michael Ellerman
2007-03-06 15:06 ` [PATCH 2/2] Make pcibios_add_platform_entries() return errors Michael Ellerman
2007-03-06 18:05 ` James Bottomley [this message]
2007-03-07 8:55 ` [parisc-linux] [PATCH 2/2] Make pcibios_add_platform_entries() Michael Ellerman
2007-03-06 18:01 ` [parisc-linux] [PATCH 1/2] Use a weak symbol for the empty James Bottomley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1173204301.3379.33.camel@mulgrave.il.steeleye.com \
--to=james.bottomley@steeleye.com \
--cc=chris@zankel.net \
--cc=dev-etrax@axis.com \
--cc=dhowells@redhat.com \
--cc=discuss@x86-64.org \
--cc=gerg@uclinux.org \
--cc=greg@kroah.com \
--cc=ink@jurassic.park.msu.ru \
--cc=kernel@wantstofly.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-pci@atrey.karlin.mff.cuni.cz \
--cc=linuxppc-dev@ozlabs.org \
--cc=michael@ellerman.id.au \
--cc=parisc-linux@parisc-linux.org \
--cc=rth@twiddle.net \
--cc=sparclinux@vger.kernel.org \
--cc=uclinux-v850@lsi.nec.co.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox