Skip to content

Commit a739de6

Browse files
Phil Elwellpopcornmix
Phil Elwell
authored andcommitted
bcm2835-sdhost: Restore ATOMIC flag to PIO sg mapping
Allocation problems have been seen in a wireless driver, and this is the only change which might have been responsible.
1 parent a2c393e commit a739de6

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

drivers/mmc/host/bcm2835-sdhost.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -874,15 +874,14 @@ static void bcm2835_sdhost_prepare_data(struct bcm2835_host *host, struct mmc_co
874874
host->flush_fifo = 0;
875875
host->data->bytes_xfered = 0;
876876

877-
878877
if (!host->dma_desc) {
879878
/* Use PIO */
880-
int flags;
879+
int flags = SG_MITER_ATOMIC;
881880

882881
if (data->flags & MMC_DATA_READ)
883-
flags = SG_MITER_TO_SG;
882+
flags |= SG_MITER_TO_SG;
884883
else
885-
flags = SG_MITER_FROM_SG;
884+
flags |= SG_MITER_FROM_SG;
886885
sg_miter_start(&host->sg_miter, data->sg, data->sg_len, flags);
887886
host->blocks = data->blocks;
888887
}

0 commit comments

Comments
 (0)