From a5645025afd9341b5a7e8a2d20f479bb3539226d Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sat, 9 Jul 2011 16:42:26 +0200
Subject: [PATCH] --- yaml --- r: 256637 b: refs/heads/master c:
 d873d794235efa590ab3c94d5ee22bb1fab19ac4 h: refs/heads/master i:   256635:
 9ccfeca95cc74ad71f57719d181aed601cce4df3 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/firewire/core-cdev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bb4b7ceca714..59259c5be79d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f426173e54a4f0882f9516c226f3165a3bd5474
+refs/heads/master: d873d794235efa590ab3c94d5ee22bb1fab19ac4
diff --git a/trunk/drivers/firewire/core-cdev.c b/trunk/drivers/firewire/core-cdev.c
index b1c11775839c..9b5915ebeb35 100644
--- a/trunk/drivers/firewire/core-cdev.c
+++ b/trunk/drivers/firewire/core-cdev.c
@@ -1583,7 +1583,7 @@ static int dispatch_ioctl(struct client *client,
 	if (_IOC_TYPE(cmd) != '#' ||
 	    _IOC_NR(cmd) >= ARRAY_SIZE(ioctl_handlers) ||
 	    _IOC_SIZE(cmd) > sizeof(buffer))
-		return -EINVAL;
+		return -ENOTTY;
 
 	if (_IOC_DIR(cmd) == _IOC_READ)
 		memset(&buffer, 0, _IOC_SIZE(cmd));