Skip to content

Commit b15e653

Browse files
hghimirarodrigovivi
authored andcommitted
drm/xe/xe_devcoredump: Check NULL before assignments
Assign 'xe_devcoredump_snapshot *' and 'xe_device *' only if 'coredump' is not NULL. v2 - Fix commit messages. v3 - Define variables before code.(Ashutosh/Jose) v4 - Drop return check for coredump_to_xe. (Jose/Rodrigo) v5 - Modify misleading commit message. (Matt) Cc: Matt Roper <[email protected]> Cc: Ashutosh Dixit <[email protected]> Cc: José Roberto de Souza <[email protected]> Cc: Rodrigo Vivi <[email protected]> Signed-off-by: Himal Prasad Ghimiray <[email protected]> Reviewed-by: Rodrigo Vivi <[email protected]> Reviewed-by: José Roberto de Souza <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent 345dadc commit b15e653

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

drivers/gpu/drm/xe/xe_devcoredump.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,19 @@ static ssize_t xe_devcoredump_read(char *buffer, loff_t offset,
7777
size_t count, void *data, size_t datalen)
7878
{
7979
struct xe_devcoredump *coredump = data;
80-
struct xe_device *xe = coredump_to_xe(coredump);
81-
struct xe_devcoredump_snapshot *ss = &coredump->snapshot;
80+
struct xe_device *xe;
81+
struct xe_devcoredump_snapshot *ss;
8282
struct drm_printer p;
8383
struct drm_print_iterator iter;
8484
struct timespec64 ts;
8585
int i;
8686

87-
/* Our device is gone already... */
88-
if (!data || !coredump_to_xe(coredump))
87+
if (!coredump)
8988
return -ENODEV;
9089

90+
xe = coredump_to_xe(coredump);
91+
ss = &coredump->snapshot;
92+
9193
/* Ensure delayed work is captured before continuing */
9294
flush_work(&ss->work);
9395

0 commit comments

Comments
 (0)