diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-08-26 07:45:37 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-08-26 07:45:37 +0200 |
| commit | 94d4ac2f4a58c6e37876827c6688c61cef21290c (patch) | |
| tree | 732f4e4794f3c116041242f69754637f75c0dd57 /drivers/s390/char/tape_std.c | |
| parent | x86: cleanup in amd_cpu_notify() (diff) | |
| parent | x86: msr: fix bogus return values from rdmsr_safe/wrmsr_safe (diff) | |
| download | linux-94d4ac2f4a58c6e37876827c6688c61cef21290c.tar.xz linux-94d4ac2f4a58c6e37876827c6688c61cef21290c.zip | |
Merge branch 'x86/urgent' into x86/cleanups
Diffstat (limited to 'drivers/s390/char/tape_std.c')
| -rw-r--r-- | drivers/s390/char/tape_std.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c index 2a1af4e60be0..cc8fd781ee22 100644 --- a/drivers/s390/char/tape_std.c +++ b/drivers/s390/char/tape_std.c @@ -248,7 +248,7 @@ tape_std_mtsetblk(struct tape_device *device, int count) /* Allocate a new idal buffer. */ new = idal_buffer_alloc(count, 0); - if (new == NULL) + if (IS_ERR(new)) return -ENOMEM; if (device->char_data.idal_buf != NULL) idal_buffer_free(device->char_data.idal_buf); |