diff options
author | Ville Syrjala <syrjala@sci.fi> | 2008-07-24 00:31:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 13:47:39 -0400 |
commit | 3880b0b5297ae9bf58a7662d13a46b5d5f0b2af6 (patch) | |
tree | f450fe9d753da590357f9f80a8a6bf2ed63127c6 /drivers/video | |
parent | 50cd0221c9062ec5dac8a3620f36f568df052ac1 (diff) |
atyfb: correct_chipset() can fail
Atari probe code relies on correct_chipset() failing if the device is not
a mach64 GX/CX. aty_chips[] array would be indexed with -1 in that case.
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index d7ba3f1a4d80..d6903c70bee5 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -424,7 +424,6 @@ static struct { | |||
424 | #endif /* CONFIG_FB_ATY_CT */ | 424 | #endif /* CONFIG_FB_ATY_CT */ |
425 | }; | 425 | }; |
426 | 426 | ||
427 | /* can not fail */ | ||
428 | static int __devinit correct_chipset(struct atyfb_par *par) | 427 | static int __devinit correct_chipset(struct atyfb_par *par) |
429 | { | 428 | { |
430 | u8 rev; | 429 | u8 rev; |
@@ -437,6 +436,9 @@ static int __devinit correct_chipset(struct atyfb_par *par) | |||
437 | if (par->pci_id == aty_chips[i].pci_id) | 436 | if (par->pci_id == aty_chips[i].pci_id) |
438 | break; | 437 | break; |
439 | 438 | ||
439 | if (i < 0) | ||
440 | return -ENODEV; | ||
441 | |||
440 | name = aty_chips[i].name; | 442 | name = aty_chips[i].name; |
441 | par->pll_limits.pll_max = aty_chips[i].pll; | 443 | par->pll_limits.pll_max = aty_chips[i].pll; |
442 | par->pll_limits.mclk = aty_chips[i].mclk; | 444 | par->pll_limits.mclk = aty_chips[i].mclk; |