diff --git a/[refs] b/[refs] index dfe93dec944d..e15a66c7736c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7a9a4d782628b4bd2392d931b95bd49732a2918 +refs/heads/master: ed31b2dfad01d23446860c983ff94460d7971c48 diff --git a/trunk/arch/arm/mach-u300/clock.c b/trunk/arch/arm/mach-u300/clock.c index d6f8232757ff..5cd04d6751b3 100644 --- a/trunk/arch/arm/mach-u300/clock.c +++ b/trunk/arch/arm/mach-u300/clock.c @@ -682,7 +682,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate) } else { printk(KERN_ERR "clock: Failed to set %s to %ld hz\n", clk->name, rate); - return -1; + return -EINVAL; } } EXPORT_SYMBOL(clk_set_rate);