* linux-next: manual merge of the driver-core tree with the pcmcia tree
@ 2010-02-02 6:01 Stephen Rothwell
2010-02-02 15:22 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-02-02 6:01 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Dominik Brodowski, Thomas Gleixner
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/pcmcia/ds.c between commit
933a838aa1aae8388438bb002fbdaf6fca519a5c ("pcmcia: make use of
pcmcia_dev_resume() return value") from the pcmcia tree and commit
df5a0aec4591ae8a5deb67bc8cb6be3d0812abb2 ("drivers/base: Convert dev->sem
to mutex") from the driver-core tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/pcmcia/ds.c
index 76a2163,263bdc8..0000000
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@@ -999,10 -974,9 +999,10 @@@ static int runtime_resume(struct devic
{
int rc;
- down(&dev->sem);
+ mutex_lock(&dev->mutex);
rc = pcmcia_dev_resume(dev);
- up(&dev->sem);
+ mutex_unlock(&dev->mutex);
+ return rc;
}
/************************ per-device sysfs output ***************************/
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the pcmcia tree
2010-02-02 6:01 linux-next: manual merge of the driver-core tree with the pcmcia tree Stephen Rothwell
@ 2010-02-02 15:22 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2010-02-02 15:22 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Dominik Brodowski, Thomas Gleixner
On Tue, Feb 02, 2010 at 05:01:59PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/pcmcia/ds.c between commit
> 933a838aa1aae8388438bb002fbdaf6fca519a5c ("pcmcia: make use of
> pcmcia_dev_resume() return value") from the pcmcia tree and commit
> df5a0aec4591ae8a5deb67bc8cb6be3d0812abb2 ("drivers/base: Convert dev->sem
> to mutex") from the driver-core tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Fix looks fine, thanks for carrying it.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-02-02 15:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-02 6:01 linux-next: manual merge of the driver-core tree with the pcmcia tree Stephen Rothwell
2010-02-02 15:22 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox