Skip to content

Commit

Permalink
[SPARC64]: Fix OOPS in dma_sync_*_for_device()
Browse files Browse the repository at this point in the history
I included these operations vector cases for situations
where we never need to do anything, the entries aren't
filled in by any implementation, so we OOPS trying to
invoke NULL pointer functions.

Really make them NOPs, to fix the bug.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Dec 20, 2007
1 parent fbdcf18 commit 36bb613
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions include/asm-sparc64/dma-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,9 @@ struct dma_ops {
void (*sync_single_for_cpu)(struct device *dev,
dma_addr_t dma_handle, size_t size,
enum dma_data_direction direction);
void (*sync_single_for_device)(struct device *dev,
dma_addr_t dma_handle, size_t size,
enum dma_data_direction direction);
void (*sync_sg_for_cpu)(struct device *dev, struct scatterlist *sg,
int nelems,
enum dma_data_direction direction);
void (*sync_sg_for_device)(struct device *dev, struct scatterlist *sg,
int nelems,
enum dma_data_direction direction);
};
extern const struct dma_ops *dma_ops;

Expand Down Expand Up @@ -105,7 +99,7 @@ static inline void dma_sync_single_for_device(struct device *dev,
size_t size,
enum dma_data_direction direction)
{
dma_ops->sync_single_for_device(dev, dma_handle, size, direction);
/* No flushing needed to sync cpu writes to the device. */
}

static inline void dma_sync_single_range_for_cpu(struct device *dev,
Expand All @@ -123,7 +117,7 @@ static inline void dma_sync_single_range_for_device(struct device *dev,
size_t size,
enum dma_data_direction direction)
{
dma_sync_single_for_device(dev, dma_handle+offset, size, direction);
/* No flushing needed to sync cpu writes to the device. */
}


Expand All @@ -138,7 +132,7 @@ static inline void dma_sync_sg_for_device(struct device *dev,
struct scatterlist *sg, int nelems,
enum dma_data_direction direction)
{
dma_ops->sync_sg_for_device(dev, sg, nelems, direction);
/* No flushing needed to sync cpu writes to the device. */
}

static inline int dma_mapping_error(dma_addr_t dma_addr)
Expand Down

0 comments on commit 36bb613

Please sign in to comment.