Skip to contentSkip to conversation

Fix build breakage in your tree in the drivers/staging/iio directory

DISCUSSION Greg KH 1 participant 2 messages Nov 26, 2011

Subsystems (3)
lore
Share & tools
lore

Greg KH

author
#0 lore raw

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.

thanks,

greg k-h

author
#1 lore raw
Quoted 7 lines · Greg KH

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 <[email protected]>
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())

drivers/staging/iio/industrialio-core.c +1 -1
index 2656409..6542489 100644
@@ -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;