diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
| commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
| tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /drivers/s390/char/tape_std.c | |
| parent | 712d6954e3998d0de2840d8130941e8042541246 (diff) | |
| parent | 82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
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) | |||
| 248 | 248 | ||
| 249 | /* Allocate a new idal buffer. */ | 249 | /* Allocate a new idal buffer. */ |
| 250 | new = idal_buffer_alloc(count, 0); | 250 | new = idal_buffer_alloc(count, 0); |
| 251 | if (new == NULL) | 251 | if (IS_ERR(new)) |
| 252 | return -ENOMEM; | 252 | return -ENOMEM; |
| 253 | if (device->char_data.idal_buf != NULL) | 253 | if (device->char_data.idal_buf != NULL) |
| 254 | idal_buffer_free(device->char_data.idal_buf); | 254 | idal_buffer_free(device->char_data.idal_buf); |