Messages in this thread | | | Date | Mon, 23 Sep 2013 13:21:22 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with the staging.current tree |
| |
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in drivers/iio/industrialio-event.c between commit cadc2125e140 ("iio: fix: Keep a reference to the IIO device for open file descriptors") from the staging.current tree and commit a646fbf0fd11 ("iio: use anon_inode_getfd () with O_CLOEXEC flag") from the staging tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/iio/industrialio-event.c index 6be65ef,2390e3d..0000000 --- a/drivers/iio/industrialio-event.c +++ b/drivers/iio/industrialio-event.c @@@ -163,10 -158,8 +163,10 @@@ int iio_event_getfd(struct iio_dev *ind return -EBUSY; } spin_unlock_irq(&ev_int->wait.lock); - fd = anon_inode_getfd("iio:event", - &iio_event_chrdev_fileops, ev_int, O_RDONLY | O_CLOEXEC); + iio_device_get(indio_dev); + + fd = anon_inode_getfd("iio:event", &iio_event_chrdev_fileops, - indio_dev, O_RDONLY); ++ indio_dev, O_RDONLY | O_CLOEXEC); if (fd < 0) { spin_lock_irq(&ev_int->wait.lock); __clear_bit(IIO_BUSY_BIT_POS, &ev_int->flags); [unhandled content-type:application/pgp-signature] | |