diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 10:49:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 10:49:10 -0400 |
| commit | 20dc9f01a867318ac0bc3ea9185d71f05076aeb0 (patch) | |
| tree | f8e9528f1fd926b9f7fba9618b602d711cbfcaa8 /drivers/scsi | |
| parent | 93400708dba888d45b4da01e1753a3a743f44496 (diff) | |
| parent | e1efa2a3ea266e093f690c20af7522d95540f74f (diff) | |
Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block
* 'sg' of git://git.kernel.dk/linux-2.6-block:
Correction of "Update drivers to use sg helpers" patch for IMXMMC driver
sg_init_table() should use unsigned loop index variable
sg_last() should use unsigned loop index variable
Initialise scatter/gather list in sg driver
Initialise scatter/gather list in ata_sg_setup
x86: fix pci-gart failure handling
SG: s390-scsi: missing size parameter in zfcp_address_to_sg()
SG: clear termination bit in sg_chain()
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/sg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index b5fa4f091387..f1871ea04045 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
| @@ -1652,6 +1652,7 @@ sg_build_sgat(Sg_scatter_hold * schp, const Sg_fd * sfp, int tablesize) | |||
| 1652 | schp->buffer = kzalloc(sg_bufflen, gfp_flags); | 1652 | schp->buffer = kzalloc(sg_bufflen, gfp_flags); |
| 1653 | if (!schp->buffer) | 1653 | if (!schp->buffer) |
| 1654 | return -ENOMEM; | 1654 | return -ENOMEM; |
| 1655 | sg_init_table(schp->buffer, tablesize); | ||
| 1655 | schp->sglist_len = sg_bufflen; | 1656 | schp->sglist_len = sg_bufflen; |
| 1656 | return tablesize; /* number of scat_gath elements allocated */ | 1657 | return tablesize; /* number of scat_gath elements allocated */ |
| 1657 | } | 1658 | } |