[PATCH] i82593.h: make header comment GPL-compatible

[linux-2.6] / drivers / block / ub.c

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index dfe3581b482a6a2d90fba42449a9ea99d4ecb8e0..bfb23d543ff7a71d1bba7b22de0ba5a5157cfaaf 100644 (file)
--- 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)
        scmd->nsg = 1;
        sg = &scmd->sgv[0];
        sg->page = virt_to_page(sc->top_sense);
-       sg->offset = (unsigned int)sc->top_sense & (PAGE_SIZE-1);
+       sg->offset = (unsigned long)sc->top_sense & (PAGE_SIZE-1);
        sg->length = UB_SENSE_SIZE;
        scmd->len = UB_SENSE_SIZE;
        scmd->lun = cmd->lun;
@@ -1891,7 +1891,7 @@ static int ub_sync_read_cap(struct ub_dev *sc, struct ub_lun *lun,
        cmd->nsg = 1;
        sg = &cmd->sgv[0];
        sg->page = virt_to_page(p);
-       sg->offset = (unsigned int)p & (PAGE_SIZE-1);
+       sg->offset = (unsigned long)p & (PAGE_SIZE-1);
        sg->length = 8;
        cmd->len = 8;
        cmd->lun = lun;
@@ -2217,8 +2217,10 @@ static int ub_probe(struct usb_interface *intf,
         * This is needed to clear toggles. It is a problem only if we do
         * `rmmod ub && modprobe ub` without disconnects, but we like that.
         */
+#if 0 /* iPod Mini fails if we do this (big white iPod works) */
        ub_probe_clear_stall(sc, sc->recv_bulk_pipe);
        ub_probe_clear_stall(sc, sc->send_bulk_pipe);
+#endif
 
        /*
         * The way this is used by the startup code is a little specific.