diff --git a/[refs] b/[refs] index 15d17e8b5410..91db65e8104f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39dd3e5d7b09b5a5010ed1aef512f2d58b65cb99 +refs/heads/master: 9f7ff701ad7b7bdcab949aa0527fe7efb3882afa diff --git a/trunk/drivers/staging/tidspbridge/core/chnl_sm.c b/trunk/drivers/staging/tidspbridge/core/chnl_sm.c index 3c05d7cb9c94..8381130e1460 100644 --- a/trunk/drivers/staging/tidspbridge/core/chnl_sm.c +++ b/trunk/drivers/staging/tidspbridge/core/chnl_sm.c @@ -828,8 +828,7 @@ int bridge_chnl_open(struct chnl_object **chnl, free_chirp_list(&pchnl->io_requests); free_chirp_list(&pchnl->free_packets_list); - if (sync_event) - kfree(sync_event); + kfree(sync_event); if (pchnl->ntfy_obj) { ntfy_delete(pchnl->ntfy_obj); diff --git a/trunk/drivers/staging/tidspbridge/pmgr/dbll.c b/trunk/drivers/staging/tidspbridge/pmgr/dbll.c index 2e20f78e2c31..31da62b14bc9 100644 --- a/trunk/drivers/staging/tidspbridge/pmgr/dbll.c +++ b/trunk/drivers/staging/tidspbridge/pmgr/dbll.c @@ -272,8 +272,7 @@ void dbll_delete(struct dbll_tar_obj *target) DBC_REQUIRE(refs > 0); DBC_REQUIRE(zl_target); - if (zl_target != NULL) - kfree(zl_target); + kfree(zl_target); }