leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firewire: Only set client->iso_context if allocation was successful.

Browse Source 
This patch fixes an OOPS on cdev release for an fd where iso context
creation failed.

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Kristian Høgsberg 2007-06-20 17:48:07 -04:00 committed by Stefan Richter
parent 18b461796b
commit 24315c5e6f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/firewire/fw-cdev.c
View File

@ -640,6 +640,7 @@ iso_callback(struct fw_iso_context *context, u32 cycle,
static int ioctl_create_iso_context(struct client *client, void *buffer) static int ioctl_create_iso_context(struct client *client, void *buffer)
{ {
struct fw_cdev_create_iso_context *request = buffer; struct fw_cdev_create_iso_context *request = buffer;
struct fw_iso_context *context;
if (request->channel > 63) if (request->channel > 63)
return -EINVAL; return -EINVAL;
@ -661,15 +662,17 @@ static int ioctl_create_iso_context(struct client *client, void *buffer)
return -EINVAL; return -EINVAL;
} }
context = fw_iso_context_create(client->device->card,
request->type,
request->channel,
request->speed,
request->header_size,
iso_callback, client);
if (IS_ERR(context))
return PTR_ERR(context);
client->iso_closure = request->closure; client->iso_closure = request->closure;
client->iso_context = fw_iso_context_create(client->device->card, client->iso_context = context;
request->type,
request->channel,
request->speed,
request->header_size,
iso_callback, client);
if (IS_ERR(client->iso_context))
return PTR_ERR(client->iso_context);
/* We only support one context at this time. */ /* We only support one context at this time. */
request->handle = 0; request->handle = 0;