diff options
| author | Linus Torvalds | 2010-10-15 18:49:16 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-10-15 18:49:16 +0200 |
| commit | 264780c29041a147f5cff5dda64d03373e24b972 (patch) | |
| tree | 4d74502d311792550f052e54a5e93ded5de5283e /drivers | |
| parent | Export dump_{write,seek} to binary loader modules (diff) | |
| parent | ubd: fix incorrect sector handling during request restart (diff) | |
| download | kernel-qcow2-linux-264780c29041a147f5cff5dda64d03373e24b972.tar.gz kernel-qcow2-linux-264780c29041a147f5cff5dda64d03373e24b972.tar.xz kernel-qcow2-linux-264780c29041a147f5cff5dda64d03373e24b972.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
ubd: fix incorrect sector handling during request restart
ps3disk: passing wrong variable to bvec_kunmap_irq()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/ps3disk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c index e9da874d0419..03688c2da319 100644 --- a/drivers/block/ps3disk.c +++ b/drivers/block/ps3disk.c @@ -113,7 +113,7 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev, memcpy(buf, dev->bounce_buf+offset, size); offset += size; flush_kernel_dcache_page(bvec->bv_page); - bvec_kunmap_irq(bvec, &flags); + bvec_kunmap_irq(buf, &flags); i++; } } |