Commit e17fd4ba authored May 31, 2011 by John Stultz

rtc: Fix ioctl error path return



Bryan Henderson noticed that the  "RTC: Fix rtc driver ioctl specific
shortcutting" commit has a small bug: When an ioctl is called with an
invalid command code and the clock driver does not have an "ioctl"
method, the ioctl returns rc 0 instead of -ENOTTY.

This patch fixes the issue.

CC: Bryan Henderson <bryanh@giraffe-data.com>
CC: Gabor Z. Papp <gzp@papp.hu>
Reported-by: Bryan Henderson <bryanh@giraffe-data.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>

parent 1fa7b6a2

drivers/rtc/rtc-dev.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -421,7 +421,8 @@ static long rtc_dev_ioctl(struct file *file,
		err = ops->ioctl(rtc->dev.parent, cmd, arg);
		if (err == -ENOIOCTLCMD)
		err = -ENOTTY;
		}
		} else
		err = -ENOTTY;
		break;
		}

Admin message