diff options
| author | Jun Tian <jun.j.tian@intel.com> | 2014-05-12 16:54:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-15 13:19:00 -0700 |
| commit | 25c72c786cb571cfdf39a31f9f64d143d8623a7a (patch) | |
| tree | d8f77674c5d8f6bb12cbf6a8e9615b3d0e756379 /drivers/platform/goldfish | |
| parent | 49a75c444fcf07fdde2ec74428b6b1b9ff1c6b15 (diff) | |
| download | blackbird-op-linux-25c72c786cb571cfdf39a31f9f64d143d8623a7a.tar.gz blackbird-op-linux-25c72c786cb571cfdf39a31f9f64d143d8623a7a.zip | |
goldfish: fix kernel panic when using multiple adb connection
When using multiple adb on 64 bit kernel to transfer data,
the goldfish pipe interrupt will crash the kernel.
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform/goldfish')
| -rw-r--r-- | drivers/platform/goldfish/goldfish_pipe.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c index f33c6e0e7fb0..670b9b94f74b 100644 --- a/drivers/platform/goldfish/goldfish_pipe.c +++ b/drivers/platform/goldfish/goldfish_pipe.c @@ -469,6 +469,9 @@ static irqreturn_t goldfish_pipe_interrupt(int irq, void *dev_id) #ifdef CONFIG_64BIT channel = (u64)readl(dev->base + PIPE_REG_CHANNEL_HIGH) << 32; + + if (channel == 0) + break; #endif channel |= readl(dev->base + PIPE_REG_CHANNEL); |
