Re: Fix build breakage in your tree in the drivers/staging/iiodirectory

From: Greg KH
Date: Sat Nov 26 2011 - 10:42:20 EST


On Sat, Nov 26, 2011 at 07:10:13AM -0800, Greg KH wrote:
> Linus, can you please revert b46413367961c2e8bd827e067a231be982aaeee2 in
> your tree? It breaks the build and didn't seem to be tested by Al.
>
> I'll prepare a fix for this based on Al's patch, that doesn't break
> things and send it to you later next week (I'm about to jump on a plane
> for Tokyo in a few hours and can't test one at the moment), but for now,
> this should be reverted as I'm getting lots of emails about it.

Or, here's a simple one-line patch that fixes the build breakage, if you
just want to apply it instead:

-------------------

From: Greg Kroah-Hartman <gregkh@xxxxxxx>
Subject: fix build breakage in drivers/staging/iio/industrialio-core.c

This was introduced in commit b46413367961c2e8bd827e067a231be982aaeee2
(iio: fix a leak due to improper use of anon_inode_getfd())

Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Jonathan Cameron <jic23@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index 2656409..6542489 100644
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -259,7 +259,7 @@ static int iio_event_getfd(struct iio_dev *indio_dev)
indio_dev->event_interface, O_RDONLY);
if (fd < 0) {
mutex_lock(&indio_dev->event_interface->event_list_lock);
- clear_bit(IIO_BUSY_BIT_POS, &ev_int->flags);
+ clear_bit(IIO_BUSY_BIT_POS, &indio_dev->event_interface->flags);
mutex_unlock(&indio_dev->event_interface->event_list_lock);
}
return fd;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/