Hi Greg, On Wed, 19 Jun 2013 15:32:25 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/base/firmware_class.c between commit 875979368eb4 ("firmware > loader: fix use-after-free by double abort") from the driver-core.current > tree and commit fe304143b0c3 ("firmware: Avoid deadlock of usermodehelper > lock at shutdown") from the driver-core tree. > > I fixed it up (more may be required - see below) and can carry the fix as > necessary (no action is required). I missed the bit below (at least) and have now added this as a merge fix for the driver-core tree. From: Stephen Rothwell Date: Wed, 19 Jun 2013 17:08:01 +1000 Subject: [PATCH] fix up for fw_load_abort API change Signed-off-by: Stephen Rothwell --- drivers/base/firmware_class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 57aa842..fdacd77 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -812,7 +812,7 @@ static void firmware_class_timeout_work(struct work_struct *work) struct firmware_priv, timeout_work.work); mutex_lock(&fw_lock); - fw_load_abort(fw_priv); + fw_load_abort(fw_priv->buf); mutex_unlock(&fw_lock); } -- 1.8.1 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au