[Nouveau] [PATCH V2 2/4] pwr: make nouveau_pwr_pgob() non-static

Vince Hsu vinceh at nvidia.com
Mon Dec 22 17:37:07 PST 2014


On 12/22/2014 05:11 PM, Vince Hsu wrote:
> The platform device does not use the common nouveau_pwr_init() to initialize
> the PWR, but it does need the .prob() be assigned to avoid NULL pointer
> dereference in graph/nve4.c.
s/prob/pgob/  :-(
Will fix in next version.
>
> Signed-off-by: Vince Hsu <vinceh at nvidia.com>
> ---
>
> v2: this patch is added since v2. (v1 is the RFC actually)
>
>   nvkm/subdev/pwr/base.c | 2 +-
>   nvkm/subdev/pwr/priv.h | 1 +
>   2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/nvkm/subdev/pwr/base.c b/nvkm/subdev/pwr/base.c
> index 0ab55f27ec45..1ea433a5e118 100644
> --- a/nvkm/subdev/pwr/base.c
> +++ b/nvkm/subdev/pwr/base.c
> @@ -26,7 +26,7 @@
>   
>   #include "priv.h"
>   
> -static void
> +void
>   nouveau_pwr_pgob(struct nouveau_pwr *ppwr, bool enable)
>   {
>   	const struct nvkm_pwr_impl *impl = (void *)nv_oclass(ppwr);
> diff --git a/nvkm/subdev/pwr/priv.h b/nvkm/subdev/pwr/priv.h
> index 3814a341db32..86149d9a440c 100644
> --- a/nvkm/subdev/pwr/priv.h
> +++ b/nvkm/subdev/pwr/priv.h
> @@ -26,6 +26,7 @@ int _nouveau_pwr_ctor(struct nouveau_object *, struct nouveau_object *,
>   #define _nouveau_pwr_dtor _nouveau_subdev_dtor
>   int _nouveau_pwr_init(struct nouveau_object *);
>   int _nouveau_pwr_fini(struct nouveau_object *, bool);
> +void nouveau_pwr_pgob(struct nouveau_pwr *ppwr, bool enable);
>   
>   struct nvkm_pwr_impl {
>   	struct nouveau_oclass base;


-----------------------------------------------------------------------------------
This email message is for the sole use of the intended recipient(s) and may contain
confidential information.  Any unauthorized review, use, disclosure or distribution
is prohibited.  If you are not the intended recipient, please contact the sender by
reply email and destroy all copies of the original message.
-----------------------------------------------------------------------------------


More information about the Nouveau mailing list