linux-mips
[Top] [All Lists]

Re: [parisc-linux] [PATCH 2/2] Make pcibios_add_platform_entries() retur

To: James Bottomley <James.Bottomley@SteelEye.com>
Subject: Re: [parisc-linux] [PATCH 2/2] Make pcibios_add_platform_entries() return errors
From: Michael Ellerman <michael@ellerman.id.au>
Date: Wed, 07 Mar 2007 09:55:18 +0100
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
In-reply-to: <1173204301.3379.33.camel@mulgrave.il.steeleye.com>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20070306150725.68D97DDF36@ozlabs.org> <1173204301.3379.33.camel@mulgrave.il.steeleye.com>
Reply-to: michael@ellerman.id.au
Sender: linux-mips-bounce@linux-mips.org
On Tue, 2007-03-06 at 12:05 -0600, James Bottomley wrote:
> 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.

Ah crud, don't write patches during meetings. I'll send a fixed version.

cheers

-- 
Michael Ellerman
OzLabs, IBM Australia Development Lab

wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person

Attachment: signature.asc
Description: This is a digitally signed message part

<Prev in Thread] Current Thread [Next in Thread>