]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
cs5520: add enablebits checking
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Wed, 6 Aug 2008 16:40:27 +0000 (18:40 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 20 Aug 2008 18:05:10 +0000 (11:05 -0700)
upstream commit is 24307ffabd5b39bad443641f54b12ee2ba7a38ac

Based on sparse comments in OpenFirmware code
(no Cx5510/Cx5520 datasheet here).

This fixes 2.6.26 regression reported by TAKADA
and caused by addition of warm-plug support.

Tested-by: TAKADA Yoshihito <takada@mbf.nifty.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/ide/pci/cs5520.c

index 992b1cf8db6976be67833338a6932ba19593e4aa..0cfddf472a3042a3ef591bce7475ecd32c4b4fb0 100644 (file)
@@ -123,6 +123,7 @@ static const struct ide_dma_ops cs5520_dma_ops = {
 #define DECLARE_CS_DEV(name_str)                               \
        {                                                       \
                .name           = name_str,                     \
+               .enablebits     = { {0x60, 0x01, 0x01}, {0x60, 0x02, 0x02} }, \
                .port_ops       = &cs5520_port_ops,             \
                .dma_ops        = &cs5520_dma_ops,              \
                .host_flags     = IDE_HFLAG_ISA_PORTS |         \