diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-29 01:10:35 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-10-29 01:10:35 -0400 |
| commit | fc228a04a4c01bbb2f898e180a14f9a976001f79 (patch) | |
| tree | c6015f399aac7f0566dfadb984d843fe67175329 /drivers/block | |
| parent | 9fcc2e8a752f7d3d889114221b67c459557823e9 (diff) | |
| parent | 8a212ab6b8a4ccc6f3c3d1beba5f92655c576404 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/ub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/ub.c b/drivers/block/ub.c index ed4d5006fe62..bfb23d543ff7 100644 --- a/drivers/block/ub.c +++ b/drivers/block/ub.c | |||
| @@ -1512,7 +1512,7 @@ static void ub_state_sense(struct ub_dev *sc, struct ub_scsi_cmd *cmd) | |||
| 1512 | scmd->nsg = 1; | 1512 | scmd->nsg = 1; |
| 1513 | sg = &scmd->sgv[0]; | 1513 | sg = &scmd->sgv[0]; |
| 1514 | sg->page = virt_to_page(sc->top_sense); | 1514 | sg->page = virt_to_page(sc->top_sense); |
| 1515 | sg->offset = (unsigned int)sc->top_sense & (PAGE_SIZE-1); | 1515 | sg->offset = (unsigned long)sc->top_sense & (PAGE_SIZE-1); |
| 1516 | sg->length = UB_SENSE_SIZE; | 1516 | sg->length = UB_SENSE_SIZE; |
| 1517 | scmd->len = UB_SENSE_SIZE; | 1517 | scmd->len = UB_SENSE_SIZE; |
| 1518 | scmd->lun = cmd->lun; | 1518 | scmd->lun = cmd->lun; |
| @@ -1891,7 +1891,7 @@ static int ub_sync_read_cap(struct ub_dev *sc, struct ub_lun *lun, | |||
| 1891 | cmd->nsg = 1; | 1891 | cmd->nsg = 1; |
| 1892 | sg = &cmd->sgv[0]; | 1892 | sg = &cmd->sgv[0]; |
| 1893 | sg->page = virt_to_page(p); | 1893 | sg->page = virt_to_page(p); |
| 1894 | sg->offset = (unsigned int)p & (PAGE_SIZE-1); | 1894 | sg->offset = (unsigned long)p & (PAGE_SIZE-1); |
| 1895 | sg->length = 8; | 1895 | sg->length = 8; |
| 1896 | cmd->len = 8; | 1896 | cmd->len = 8; |
| 1897 | cmd->lun = lun; | 1897 | cmd->lun = lun; |