diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2010-01-22 17:29:16 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-25 19:50:03 -0500 |
commit | f6b56704f78b2667fc8f61d2f398931fbc032b62 (patch) | |
tree | f90e6168fee4f5de76ad43dfbda3d65b4e4305f9 /arch/arm/plat-samsung/adc.c | |
parent | d85127319cc36c38eb99615c52531c6ef2f11369 (diff) |
ARM: SAMSUNG: Fix null pointer dereference in ADC driver
ARM: SAMSUNG: Fix null pointer dereference in ADC driver
Use struct adc_device instead of relying on client (which could be
NULL) when checking for SoC type.
Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-samsung/adc.c')
-rw-r--r-- | arch/arm/plat-samsung/adc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c index 120b7902fc2f..c7659b7378b1 100644 --- a/arch/arm/plat-samsung/adc.c +++ b/arch/arm/plat-samsung/adc.c | |||
@@ -295,7 +295,7 @@ static irqreturn_t s3c_adc_irq(int irq, void *pw) | |||
295 | } | 295 | } |
296 | 296 | ||
297 | exit: | 297 | exit: |
298 | if (platform_get_device_id(client->pdev)->driver_data == TYPE_S3C64XX) { | 298 | if (platform_get_device_id(adc->pdev)->driver_data == TYPE_S3C64XX) { |
299 | /* Clear ADC interrupt */ | 299 | /* Clear ADC interrupt */ |
300 | writel(0, adc->regs + S3C64XX_ADCCLRINT); | 300 | writel(0, adc->regs + S3C64XX_ADCCLRINT); |
301 | } | 301 | } |