From: Stephen Rothwell on
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
Stephen Rothwell sfr(a)

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 ***************************/
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)
More majordomo info at
Please read the FAQ at