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

Commit 1993b176 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide 

Pull IDE fixes from David Miller:
 "Just two small changes:

  1) Remove bogus init annotation in icside, from Arnd Bergmann.

  2) Don't use zero clock rates in palm_bk3710 driver, from Wolfram
     Sang"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: palm_bk3710: test clock rate to avoid division by 0
  ide: icside: remove incorrect initconst annotation
parents d4dc3b24 0d7ef45c

drivers/ide/icside.c

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static int icside_register_v5(struct icside_state *state, 
	return ret;

}



static const struct ide_port_info icside_v6_port_info __initconst = {

static const struct ide_port_info icside_v6_port_info = {

	.init_dma		= icside_dma_off_init,

	.port_ops		= &icside_v6_no_dma_port_ops,

	.host_flags		= IDE_HFLAG_SERIALIZE | IDE_HFLAG_MMIO,

drivers/ide/palm_bk3710.c

+2 −0
Original line number Diff line number Diff line
@@ -325,6 +325,8 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) 


	clk_enable(clk);

	rate = clk_get_rate(clk);

	if (!rate)

		return -EINVAL;



	/* NOTE:  round *down* to meet minimum timings; we count in clocks */

	ideclk_period = 1000000000UL / rate;