diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/firewire/nosy.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/firewire/nosy.c')
| -rw-r--r-- | drivers/firewire/nosy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/nosy.c b/drivers/firewire/nosy.c index 8528b10763ed..0618145376ad 100644 --- a/drivers/firewire/nosy.c +++ b/drivers/firewire/nosy.c | |||
| @@ -302,7 +302,7 @@ nosy_open(struct inode *inode, struct file *file) | |||
| 302 | 302 | ||
| 303 | file->private_data = client; | 303 | file->private_data = client; |
| 304 | 304 | ||
| 305 | return 0; | 305 | return nonseekable_open(inode, file); |
| 306 | fail: | 306 | fail: |
| 307 | kfree(client); | 307 | kfree(client); |
| 308 | lynx_put(lynx); | 308 | lynx_put(lynx); |