From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Sat, 03 Feb 2018 17:39:58 +0000 Subject: [PATCH 3/6] hid-prodikeys: Move an assignment in pk_probe() Message-Id: <44c2767f-c66c-3b36-4bd1-059d5d2f4461@users.sourceforge.net> List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-input@vger.kernel.org, Benjamin Tissoires , Jiri Kosina Cc: LKML , kernel-janitors@vger.kernel.org From: Markus Elfring Date: Sat, 3 Feb 2018 17:20:01 +0100 Move one assignment for a data structure member in one local variable so that its setting will only be performed after a corresponding memory allocation succeeded by this function. Signed-off-by: Markus Elfring --- drivers/hid/hid-prodikeys.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c index 2e79dfc92162..7672f723b268 100644 --- a/drivers/hid/hid-prodikeys.c +++ b/drivers/hid/hid-prodikeys.c @@ -804,8 +804,6 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id) if (!pk) return -ENOMEM; - pk->hdev = hdev; - pm = kzalloc(sizeof(*pm), GFP_KERNEL); if (pm = NULL) { ret = -ENOMEM; @@ -814,6 +812,7 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id) pm->pk = pk; pk->pm = pm; + pk->hdev = hdev; pm->ifnum = ifnum; hid_set_drvdata(hdev, pk); -- 2.16.1