From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
Wolfram Sang <w.sang@pengutronix.de>,
Jean Delvare <khali@linux-fr.org>
Subject: [27/30] i2c/pca: Dont use *_interruptible
Date: Wed, 20 Jan 2010 20:15:48 -0800 [thread overview]
Message-ID: <20100121041836.007303419@mini.kroah.org> (raw)
In-Reply-To: <20100121041852.GA9656@kroah.com>
2.6.32-stable review patch. If anyone has any objections, please let us know.
------------------
From: Wolfram Sang <w.sang@pengutronix.de>
commit 22f8b2695eda496026623020811cae34590ee3d7 upstream.
Unexpected signals can disturb the bus-handling and lock it up. Don't use
interruptible in 'wait_event_*' and 'wake_*' as in commits
dc1972d02747d2170fb1d78d114801f5ecb27506 (for cpm),
1ab082d7cbd0f34e39a5396cc6340c00bc5d66ef (for mpc),
b7af349b175af45f9d87b3bf3f0a221e1831ed39 (for omap).
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/i2c/busses/i2c-pca-isa.c | 4 ++--
drivers/i2c/busses/i2c-pca-platform.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- a/drivers/i2c/busses/i2c-pca-isa.c
+++ b/drivers/i2c/busses/i2c-pca-isa.c
@@ -75,7 +75,7 @@ static int pca_isa_waitforcompletion(voi
unsigned long timeout;
if (irq > -1) {
- ret = wait_event_interruptible_timeout(pca_wait,
+ ret = wait_event_timeout(pca_wait,
pca_isa_readbyte(pd, I2C_PCA_CON)
& I2C_PCA_CON_SI, pca_isa_ops.timeout);
} else {
@@ -96,7 +96,7 @@ static void pca_isa_resetchip(void *pd)
}
static irqreturn_t pca_handler(int this_irq, void *dev_id) {
- wake_up_interruptible(&pca_wait);
+ wake_up(&pca_wait);
return IRQ_HANDLED;
}
--- a/drivers/i2c/busses/i2c-pca-platform.c
+++ b/drivers/i2c/busses/i2c-pca-platform.c
@@ -84,7 +84,7 @@ static int i2c_pca_pf_waitforcompletion(
unsigned long timeout;
if (i2c->irq) {
- ret = wait_event_interruptible_timeout(i2c->wait,
+ ret = wait_event_timeout(i2c->wait,
i2c->algo_data.read_byte(i2c, I2C_PCA_CON)
& I2C_PCA_CON_SI, i2c->adap.timeout);
} else {
@@ -122,7 +122,7 @@ static irqreturn_t i2c_pca_pf_handler(in
if ((i2c->algo_data.read_byte(i2c, I2C_PCA_CON) & I2C_PCA_CON_SI) == 0)
return IRQ_NONE;
- wake_up_interruptible(&i2c->wait);
+ wake_up(&i2c->wait);
return IRQ_HANDLED;
}
next prev parent reply other threads:[~2010-01-21 4:26 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-21 4:18 [00/30] 2.6.32.5 review Greg KH
2010-01-21 4:15 ` [01/30] inotify: do not reuse watch descriptors Greg KH
2010-01-21 4:15 ` [02/30] inotify: only warn once for inotify problems Greg KH
2010-01-21 4:15 ` [03/30] revert "drivers/video/s3c-fb.c: fix clock setting for Samsung SoC Framebuffer" Greg KH
2010-01-21 4:15 ` [04/30] memcg: ensure list is empty at rmdir Greg KH
2010-01-21 4:15 ` [05/30] drm/i915: remove loop in Ironlake interrupt handler Greg KH
2010-01-21 4:15 ` [06/30] block: Fix incorrect reporting of partition alignment Greg KH
2010-01-21 4:15 ` [07/30] x86, mce: Thermal monitoring depends on APIC being enabled Greg KH
2010-01-21 4:15 ` [08/30] futexes: Remove rw parameter from get_futex_key() Greg KH
2010-01-21 4:15 ` [09/30] page allocator: update NR_FREE_PAGES only when necessary Greg KH
2010-01-21 4:15 ` [10/30] x86, apic: use physical mode for IBM summit platforms Greg KH
2010-01-21 4:15 ` [11/30] edac: i5000_edac critical fix panic out of bounds Greg KH
2010-01-21 4:15 ` [12/30] x86: SGI UV: Fix mapping of MMIO registers Greg KH
2010-01-21 4:15 ` [13/30] mfd: WM835x GPIO direction register is not locked Greg KH
2010-01-21 4:15 ` [14/30] mfd: Correct WM835x ISINK ramp time defines Greg KH
2010-01-21 4:15 ` [15/30] ALSA: hda - Fix missing capture mixer for ALC861/660 codecs Greg KH
2010-01-21 4:15 ` [16/30] V4L/DVB (13868): gspca - sn9c20x: Fix test of unsigned Greg KH
2010-01-21 4:15 ` [17/30] reiserfs: truncate blocks not used by a write Greg KH
2010-01-21 4:15 ` [18/30] HID: add device IDs for new model of Apple Wireless Keyboard Greg KH
2010-01-21 4:15 ` [19/30] PCI/cardbus: Add a fixup hook and fix powerpc Greg KH
2010-01-21 4:15 ` [20/30] [SCSI] megaraid_sas: remove sysfs poll_mode_io world writeable permissions Greg KH
2010-01-21 4:15 ` [21/30] Input: pmouse - move Sentelic probe down the list Greg KH
2010-01-21 4:15 ` [22/30] asus-laptop: add Lenovo SL hotkey support Greg KH
2010-01-21 4:15 ` [23/30] sched: Fix cpu_clock() in NMIs, on !CONFIG_HAVE_UNSTABLE_SCHED_CLOCK Greg KH
2010-01-21 4:15 ` [24/30] sparc64: Fix NMI programming when perf events are active Greg KH
2010-01-21 4:15 ` [25/30] sparc64: Fix Niagara2 perf event handling Greg KH
2010-01-21 4:15 ` [26/30] i2c: Do not use device name after device_unregister Greg KH
2010-01-21 4:15 ` Greg KH [this message]
2010-01-21 4:15 ` [28/30] serial/8250_pnp: add a new Fujitsu Wacom Tablet PC device Greg KH
2010-01-21 4:15 ` [29/30] sched: Fix task priority bug Greg KH
2010-01-21 4:15 ` [30/30] vfs: Fix vmtruncate() regression Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100121041836.007303419@mini.kroah.org \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=w.sang@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome