Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b26b0c59 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: fix crash at boot with siimage driver 



Some change to the IDE layer are causing the siimage driver to crash
at boot with a NULL dereference. This is due to the sil_dma_ops not
containing all the necessary pointers. I suppose it used to just
"override" the defaults while now, it needs to contain everything.

[bart: while at it: sil_dma_ops should be const now (pointed out by Sergei)]

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>,
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 7663c1e2

drivers/ide/pci/siimage.c

+8 −1
Original line number Diff line number Diff line
@@ -737,8 +737,15 @@ static const struct ide_port_ops sil_sata_port_ops = { 
	.cable_detect		= sil_cable_detect,

};



static struct ide_dma_ops sil_dma_ops = {

static const struct ide_dma_ops sil_dma_ops = {

	.dma_host_set		= ide_dma_host_set,

	.dma_setup		= ide_dma_setup,

	.dma_exec_cmd		= ide_dma_exec_cmd,

	.dma_start		= ide_dma_start,

	.dma_end		= __ide_dma_end,

	.dma_test_irq		= siimage_dma_test_irq,

	.dma_timeout		= ide_dma_timeout,

	.dma_lost_irq		= ide_dma_lost_irq,

};



#define DECLARE_SII_DEV(name_str, p_ops)		\