* linux-next: manual merge of the driver-core tree with the firmware tree
@ 2009-06-03 7:23 Stephen Rothwell
2009-06-03 14:58 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2009-06-03 7:23 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, David Woodhouse, Samuel Ortiz
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/firmware_class.c between commit
6e03a201bbe8137487f340d26aa662110e324b20 ("firmware: speed up
request_firmware(), v3") from the firmware tree and commit
ffceb90f9b59a5186b3ce9177bfebf8819b7735a ("firmware: allocate firmware id
dynamically") from the driver-core tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/base/firmware_class.c
index 8a267c4,112af80..0000000
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@@ -350,13 -277,10 +350,14 @@@ static struct bin_attribute firmware_at
static void fw_dev_release(struct device *dev)
{
struct firmware_priv *fw_priv = dev_get_drvdata(dev);
+ int i;
+ for (i = 0; i < fw_priv->nr_pages; i++)
+ __free_page(fw_priv->pages[i]);
+ kfree(fw_priv->pages);
+ kfree(fw_priv->fw_id);
kfree(fw_priv);
- kfree(dev);
+ put_device(dev);
module_put(THIS_MODULE);
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the firmware tree
2009-06-03 7:23 linux-next: manual merge of the driver-core tree with the firmware tree Stephen Rothwell
@ 2009-06-03 14:58 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2009-06-03 14:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, David Woodhouse, Samuel Ortiz
On Wed, Jun 03, 2009 at 05:23:07PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/firmware_class.c between commit
> 6e03a201bbe8137487f340d26aa662110e324b20 ("firmware: speed up
> request_firmware(), v3") from the firmware tree and commit
> ffceb90f9b59a5186b3ce9177bfebf8819b7735a ("firmware: allocate firmware id
> dynamically") from the driver-core tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
Thanks for the fixup, this looks like something we can handle when we
merge with Linus.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-06-03 15:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-03 7:23 linux-next: manual merge of the driver-core tree with the firmware tree Stephen Rothwell
2009-06-03 14:58 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).