diff --git a/[refs] b/[refs] index 7301e1b90c53..20274dc15077 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3b94fd800cc7eb59c91ccb55326cdaf589b0e88 +refs/heads/master: 1bd9784f5ebb5b1b5a1efb8302d7b57c6483e2e6 diff --git a/trunk/drivers/block/ps3vram.c b/trunk/drivers/block/ps3vram.c index 5f408c6e5b20..fbbdd5ca5720 100644 --- a/trunk/drivers/block/ps3vram.c +++ b/trunk/drivers/block/ps3vram.c @@ -72,7 +72,7 @@ struct ps3vram_priv { u64 memory_handle; u64 context_handle; u32 *ctrl; - u32 *reports; + void *reports; u8 *xdr_buf; u32 *fifo_base; @@ -102,9 +102,9 @@ static char *size = "256M"; module_param(size, charp, 0); MODULE_PARM_DESC(size, "memory size"); -static u32 *ps3vram_get_notifier(u32 *reports, int notifier) +static u32 *ps3vram_get_notifier(void *reports, int notifier) { - return (void *)reports + DMA_NOTIFIER_OFFSET_BASE + + return reports + DMA_NOTIFIER_OFFSET_BASE + DMA_NOTIFIER_SIZE * notifier; }