diff --git a/[refs] b/[refs] index 354591c7a06d..e340d35f1eb0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f72aee1896bafa0fbf0ef2cdc3babe399057a11 +refs/heads/master: c755a8283212659bad39e387377c337a27156d8a diff --git a/trunk/drivers/staging/wlags49_h2/wl_netdev.c b/trunk/drivers/staging/wlags49_h2/wl_netdev.c index 1aa61dbdb79f..e2a7ad05e545 100644 --- a/trunk/drivers/staging/wlags49_h2/wl_netdev.c +++ b/trunk/drivers/staging/wlags49_h2/wl_netdev.c @@ -1905,8 +1905,8 @@ int wl_rx_dma( struct net_device *dev ) DBG_FUNC("wl_rx") DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev); - if((( lp = (struct wl_private *)dev->priv ) != NULL ) && - !( lp->flags & WVLAN2_UIL_BUSY )) { + if((( lp = dev->priv ) != NULL ) && + !( lp->flags & WVLAN2_UIL_BUSY )) { #ifdef USE_RTS if( lp->useRTS == 1 ) {