summaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2010-07-28 23:49:45 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2010-07-29 23:06:25 +0200
commit69e61d0c07fa28a05f699723a88d49e0014019b6 (patch)
treedc17f40f9765506b511b31a2a4afddc2f2c938c4 /drivers/firewire
parente5b06c077c592e7e1623641520787a3da7b7c6bf (diff)
downloadlinux-stable-69e61d0c07fa28a05f699723a88d49e0014019b6.tar.gz
linux-stable-69e61d0c07fa28a05f699723a88d49e0014019b6.tar.bz2
linux-stable-69e61d0c07fa28a05f699723a88d49e0014019b6.zip
firewire: core: remove unused code
ioctl_create_iso_context enforces ctx->header_size >= 4. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/core-cdev.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index f40098dec14b..1a14dbf097f0 100644
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -1048,13 +1048,9 @@ static int ioctl_queue_iso(struct client *client, union ioctl_arg *arg)
* We require that header_length is a multiple of
* the fixed header size, ctx->header_size.
*/
- if (ctx->header_size == 0) {
- if (u.packet.header_length > 0)
- return -EINVAL;
- } else if (u.packet.header_length == 0 ||
- u.packet.header_length % ctx->header_size != 0) {
+ if (u.packet.header_length == 0 ||
+ u.packet.header_length % ctx->header_size != 0)
return -EINVAL;
- }
header_length = 0;
}